From patchwork Tue Sep 8 09:05:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 515316 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 36E1E14016A for ; Tue, 8 Sep 2015 19:05:54 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752138AbbIHJFx (ORCPT ); Tue, 8 Sep 2015 05:05:53 -0400 Received: from mx2.suse.de ([195.135.220.15]:44563 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752020AbbIHJFw (ORCPT ); Tue, 8 Sep 2015 05:05:52 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id E3B88ACCA; Tue, 8 Sep 2015 09:05:50 +0000 (UTC) Date: Tue, 8 Sep 2015 11:05:49 +0200 From: Jean Delvare To: Linux I2C Cc: Wolfram Sang Subject: [PATCH] i2c-dev: Fix typo in ioctl name reference Message-ID: <20150908110549.411e99a8@endymion.delvare> Organization: SUSE Linux X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.23; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The ioctl is named I2C_RDWR for "I2C read/write". But references to it were misspelled "rdrw". Fix them. Signed-off-by: Jean Delvare Cc: Wolfram Sang --- drivers/i2c/i2c-dev.c | 6 +++--- fs/compat_ioctl.c | 2 +- include/uapi/linux/i2c-dev.h | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) --- linux-4.2.orig/drivers/i2c/i2c-dev.c 2015-09-08 09:40:43.287812694 +0200 +++ linux-4.2/drivers/i2c/i2c-dev.c 2015-09-08 09:48:55.191927122 +0200 @@ -235,7 +235,7 @@ static int i2cdev_check_addr(struct i2c_ 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(st /* 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 *fi 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); --- linux-4.2.orig/fs/compat_ioctl.c 2015-09-08 09:40:43.287812694 +0200 +++ linux-4.2/fs/compat_ioctl.c 2015-09-08 09:48:55.193927164 +0200 @@ -686,7 +686,7 @@ static int do_i2c_rdwr_ioctl(unsigned in 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)) --- linux-4.2.orig/include/uapi/linux/i2c-dev.h 2015-09-08 09:40:43.287812694 +0200 +++ linux-4.2/include/uapi/linux/i2c-dev.h 2015-09-08 09:48:55.193927164 +0200 @@ -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 if for now for compatibility */ +#define I2C_RDRW_IOCTL_MAX_MSGS I2C_RDWR_IOCTL_MAX_MSGS #endif /* _UAPI_LINUX_I2C_DEV_H */