Commit 97ca843f authored by Jean Delvare's avatar Jean Delvare Committed by Wolfram Sang
Browse files

i2c: dev: Check for I2C_FUNC_I2C before calling i2c_transfer 



It is good practice to check that the underlying adapter supports
I2C transfers before attempting them. The i2c core would eventually
return an error, but it's more efficient to fail early.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
parent d08ed106

drivers/i2c/i2c-dev.c

+12 −0
Original line number Diff line number Diff line
@@ -139,6 +139,10 @@ static ssize_t i2cdev_read(struct file *file, char __user *buf, size_t count, 


	struct i2c_client *client = file->private_data;



	/* Adapter must support I2C transfers */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))

		return -EOPNOTSUPP;



	if (count > 8192)

		count = 8192;
@@ -163,6 +167,10 @@ static ssize_t i2cdev_write(struct file *file, const char __user *buf, 
	char *tmp;

	struct i2c_client *client = file->private_data;



	/* Adapter must support I2C transfers */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))

		return -EOPNOTSUPP;



	if (count > 8192)

		count = 8192;
@@ -238,6 +246,10 @@ static noinline int i2cdev_ioctl_rdwr(struct i2c_client *client, 
	u8 __user **data_ptrs;

	int i, res;



	/* Adapter must support I2C transfers */

	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))

		return -EOPNOTSUPP;



	data_ptrs = kmalloc_array(nmsgs, sizeof(u8 __user *), GFP_KERNEL);

	if (data_ptrs == NULL) {

		kfree(msgs);