summaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/68360serial.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-02-14 17:27:22 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 20:59:56 +0100
commit6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch)
treeeb6e387e080a44680d6d8686999336e69ec97e71 /drivers/tty/serial/68360serial.c
parenttty: remove filp from the USB tty ioctls (diff)
downloadlinux-6caa76b7786891b42b66a0e61e2c2fff2c884620.tar.xz
linux-6caa76b7786891b42b66a0e61e2c2fff2c884620.zip
tty: now phase out the ioctl file pointer for good
Only oddities here are a couple of drivers that bogusly called the ldisc helpers instead of returning -ENOIOCTLCMD. Fix the bug and the rest goes away. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial/68360serial.c')
-rw-r--r--drivers/tty/serial/68360serial.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/68360serial.c b/drivers/tty/serial/68360serial.c
index 217fe1c299e0..514a356d8d64 100644
--- a/drivers/tty/serial/68360serial.c
+++ b/drivers/tty/serial/68360serial.c
@@ -1405,7 +1405,7 @@ static int rs_360_get_icount(struct tty_struct *tty,
return 0;
}
-static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
+static int rs_360_ioctl(struct tty_struct *tty,
unsigned int cmd, unsigned long arg)
{
int error;