diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:27:22 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:59:56 -0500 |
commit | 6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch) | |
tree | eb6e387e080a44680d6d8686999336e69ec97e71 /drivers/usb/class | |
parent | 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (diff) |
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/class')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index e9a26fbd079c..8d994a8bdc90 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -813,7 +813,7 @@ static int acm_tty_tiocmset(struct tty_struct *tty, | |||
813 | return acm_set_control(acm, acm->ctrlout = newctrl); | 813 | return acm_set_control(acm, acm->ctrlout = newctrl); |
814 | } | 814 | } |
815 | 815 | ||
816 | static int acm_tty_ioctl(struct tty_struct *tty, struct file *file, | 816 | static int acm_tty_ioctl(struct tty_struct *tty, |
817 | unsigned int cmd, unsigned long arg) | 817 | unsigned int cmd, unsigned long arg) |
818 | { | 818 | { |
819 | struct acm *acm = tty->driver_data; | 819 | struct acm *acm = tty->driver_data; |