i2c-dev: Fix typo in ioctl name reference

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>

diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index 71c7a39..3853897 100644 (file)
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -235,7 +235,7 @@ static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr)
        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)
 {
        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
         * be sent at once */
-       if (rdwr_arg.nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
+       if (rdwr_arg.nmsgs > I2C_RDWR_IOCTL_MAX_MSGS)
                return -EINVAL;
 
        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);
 
        case I2C_RDWR:
-               return i2cdev_ioctl_rdrw(client, arg);
+               return i2cdev_ioctl_rdwr(client, arg);
 
        case I2C_SMBUS:
                return i2cdev_ioctl_smbus(client, arg);

diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 48851f6..dcf2653 100644 (file)
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -686,7 +686,7 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
 
        if (get_user(nmsgs, &udata->nmsgs))
                return -EFAULT;
-       if (nmsgs > I2C_RDRW_IOCTL_MAX_MSGS)
+       if (nmsgs > I2C_RDWR_IOCTL_MAX_MSGS)
                return -EINVAL;
 
        if (get_user(datap, &udata->msgs))

diff --git a/include/uapi/linux/i2c-dev.h b/include/uapi/linux/i2c-dev.h
index 3f31155..2f05e66 100644 (file)
--- a/include/uapi/linux/i2c-dev.h
+++ b/include/uapi/linux/i2c-dev.h
@@ -66,7 +66,9 @@ struct i2c_rdwr_ioctl_data {
        __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 */