xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c-dev: Fix typo in ioctl name reference

Browse Source 
The ioctl is named I2C_RDWR for "I2C read/write". But references to it
were misspelled "rdrw". Fix them.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Jean Delvare
2015-09-08 11:05:49 +02:00
committed by Wolfram Sang
parent d64d45cb95
commit c57d3e7a93
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/i2c/i2c-dev.c
View File

@@ -235,7 +235,7 @@ static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr)
return result; return result;
} }
static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client, static noinline int i2cdev_ioctl_rdwr(struct i2c_client *client,
unsigned long arg) unsigned long arg)
{ {
struct i2c_rdwr_ioctl_data rdwr_arg; struct i2c_rdwr_ioctl_data rdwr_arg;
@@ -250,7 +250,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
/* Put an arbitrary limit on the number of messages that can /* Put an arbitrary limit on the number of messages that can
* be sent at once */ * be sent at once */
if (rdwr_arg.nmsgs > I2C_RDRW_IOCTL_MAX_MSGS) if (rdwr_arg.nmsgs > I2C_RDWR_IOCTL_MAX_MSGS)
return -EINVAL; return -EINVAL;
rdwr_pa = memdup_user(rdwr_arg.msgs, rdwr_pa = memdup_user(rdwr_arg.msgs,
@@ -456,7 +456,7 @@ static long i2cdev_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return put_user(funcs, (unsigned long __user *)arg); return put_user(funcs, (unsigned long __user *)arg);
case I2C_RDWR: case I2C_RDWR:
return i2cdev_ioctl_rdrw(client, arg); return i2cdev_ioctl_rdwr(client, arg);
case I2C_SMBUS: case I2C_SMBUS:
return i2cdev_ioctl_smbus(client, arg); return i2cdev_ioctl_smbus(client, arg);

2
fs/compat_ioctl.c
View File

@@ -686,7 +686,7 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
if (get_user(nmsgs, &udata->nmsgs)) if (get_user(nmsgs, &udata->nmsgs))
return -EFAULT; return -EFAULT;
if (nmsgs > I2C_RDRW_IOCTL_MAX_MSGS) if (nmsgs > I2C_RDWR_IOCTL_MAX_MSGS)
return -EINVAL; return -EINVAL;
if (get_user(datap, &udata->msgs)) if (get_user(datap, &udata->msgs))

4
include/uapi/linux/i2c-dev.h
View File

@@ -66,7 +66,9 @@ struct i2c_rdwr_ioctl_data {
__u32 nmsgs; /* number of i2c_msgs */ __u32 nmsgs; /* number of i2c_msgs */
}; };
#define I2C_RDRW_IOCTL_MAX_MSGS 42 #define I2C_RDWR_IOCTL_MAX_MSGS 42
/* Originally defined with a typo, keep it for compatibility */
#define I2C_RDRW_IOCTL_MAX_MSGS I2C_RDWR_IOCTL_MAX_MSGS
#endif /* _UAPI_LINUX_I2C_DEV_H */ #endif /* _UAPI_LINUX_I2C_DEV_H */