diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-02-18 22:30:38 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-02-18 22:30:38 +0100 |
| commit | 986c6f7c3fc855032f3457a5a1b7fbcc09c375bb (patch) | |
| tree | cf5b08b5ae405ae04e0c1c728531972934d3eed0 /drivers/input/serio | |
| parent | Input: tsc200x - add axis inversion and swapping support (diff) | |
| parent | Linux 5.17-rc4 (diff) | |
| download | linux-986c6f7c3fc855032f3457a5a1b7fbcc09c375bb.tar.xz linux-986c6f7c3fc855032f3457a5a1b7fbcc09c375bb.zip | |
Merge tag 'v5.17-rc4' into next
Sync up with mainline to get the latest changes in HID subsystem.
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/serport.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c index 17eb8f2aa48d..669a728095b8 100644 --- a/drivers/input/serio/serport.c +++ b/drivers/input/serio/serport.c @@ -207,8 +207,8 @@ static void serport_set_type(struct tty_struct *tty, unsigned long type) * serport_ldisc_ioctl() allows to set the port protocol, and device ID */ -static int serport_ldisc_ioctl(struct tty_struct *tty, struct file *file, - unsigned int cmd, unsigned long arg) +static int serport_ldisc_ioctl(struct tty_struct *tty, unsigned int cmd, + unsigned long arg) { if (cmd == SPIOCSTYPE) { unsigned long type; @@ -226,7 +226,6 @@ static int serport_ldisc_ioctl(struct tty_struct *tty, struct file *file, #ifdef CONFIG_COMPAT #define COMPAT_SPIOCSTYPE _IOW('q', 0x01, compat_ulong_t) static int serport_ldisc_compat_ioctl(struct tty_struct *tty, - struct file *file, unsigned int cmd, unsigned long arg) { if (cmd == COMPAT_SPIOCSTYPE) { |