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/rocket.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/rocket.c')
-rw-r--r-- | drivers/char/rocket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c index 36c108811a81..3780da8ad12d 100644 --- a/drivers/char/rocket.c +++ b/drivers/char/rocket.c | |||
@@ -1326,7 +1326,7 @@ static int get_version(struct r_port *info, struct rocket_version __user *retver | |||
1326 | } | 1326 | } |
1327 | 1327 | ||
1328 | /* IOCTL call handler into the driver */ | 1328 | /* IOCTL call handler into the driver */ |
1329 | static int rp_ioctl(struct tty_struct *tty, struct file *file, | 1329 | static int rp_ioctl(struct tty_struct *tty, |
1330 | unsigned int cmd, unsigned long arg) | 1330 | unsigned int cmd, unsigned long arg) |
1331 | { | 1331 | { |
1332 | struct r_port *info = tty->driver_data; | 1332 | struct r_port *info = tty->driver_data; |