diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 17:27:22 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 20:59:56 +0100 |
commit | 6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch) | |
tree | eb6e387e080a44680d6d8686999336e69ec97e71 /drivers/usb/serial/usb-serial.c | |
parent | tty: remove filp from the USB tty ioctls (diff) | |
download | linux-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/usb/serial/usb-serial.c')
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index b1110e136c33..a72575349744 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -406,7 +406,7 @@ static void serial_unthrottle(struct tty_struct *tty) port->serial->type->unthrottle(tty); } -static int serial_ioctl(struct tty_struct *tty, struct file *file, +static int serial_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct usb_serial_port *port = tty->driver_data; |