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/char/cyclades.c | |
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/char/cyclades.c')
-rw-r--r-- | drivers/char/cyclades.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 942b6f2b70a4..c99728f0cd9f 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
@@ -2680,7 +2680,7 @@ static int cy_cflags_changed(struct cyclades_port *info, unsigned long arg, | |||
2680 | * not recognized by the driver, it should return ENOIOCTLCMD. | 2680 | * not recognized by the driver, it should return ENOIOCTLCMD. |
2681 | */ | 2681 | */ |
2682 | static int | 2682 | static int |
2683 | cy_ioctl(struct tty_struct *tty, struct file *file, | 2683 | cy_ioctl(struct tty_struct *tty, |
2684 | unsigned int cmd, unsigned long arg) | 2684 | unsigned int cmd, unsigned long arg) |
2685 | { | 2685 | { |
2686 | struct cyclades_port *info = tty->driver_data; | 2686 | struct cyclades_port *info = tty->driver_data; |