diff options
| author | Alan Cox | 2011-02-14 17:27:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-02-17 20:59:56 +0100 |
| commit | 6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch) | |
| tree | eb6e387e080a44680d6d8686999336e69ec97e71 /drivers/char/pcmcia/ipwireless | |
| parent | tty: remove filp from the USB tty ioctls (diff) | |
| download | kernel-qcow2-linux-6caa76b7786891b42b66a0e61e2c2fff2c884620.tar.gz kernel-qcow2-linux-6caa76b7786891b42b66a0e61e2c2fff2c884620.tar.xz kernel-qcow2-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/char/pcmcia/ipwireless')
| -rw-r--r-- | drivers/char/pcmcia/ipwireless/tty.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/pcmcia/ipwireless/tty.c b/drivers/char/pcmcia/ipwireless/tty.c index 748190dfbab0..ef92869502a7 100644 --- a/drivers/char/pcmcia/ipwireless/tty.c +++ b/drivers/char/pcmcia/ipwireless/tty.c @@ -425,7 +425,7 @@ ipw_tiocmset(struct tty_struct *linux_tty, return set_control_lines(tty, set, clear); } -static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file, +static int ipw_ioctl(struct tty_struct *linux_tty, unsigned int cmd, unsigned long arg) { struct ipw_tty *tty = linux_tty->driver_data; @@ -484,7 +484,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty, struct file *file, return tty_perform_flush(linux_tty, arg); } } - return tty_mode_ioctl(linux_tty, file, cmd , arg); + return -ENOIOCTLCMD; } static int add_tty(int j, |