diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-02-14 16:27:22 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 11:59:56 -0800 |
| commit | 6caa76b7786891b42b66a0e61e2c2fff2c884620 (patch) | |
| tree | eb6e387e080a44680d6d8686999336e69ec97e71 /drivers/tty/tty_io.c | |
| parent | 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (diff) | |
| download | linux-6caa76b7786891b42b66a0e61e2c2fff2c884620.tar.gz linux-6caa76b7786891b42b66a0e61e2c2fff2c884620.tar.bz2 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/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 83af24ca1e5e..20a862a2a0c2 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2676,7 +2676,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; } if (tty->ops->ioctl) { - retval = (tty->ops->ioctl)(tty, file, cmd, arg); + retval = (tty->ops->ioctl)(tty, cmd, arg); if (retval != -ENOIOCTLCMD) return retval; } @@ -2704,7 +2704,7 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd, return -EINVAL; if (tty->ops->compat_ioctl) { - retval = (tty->ops->compat_ioctl)(tty, file, cmd, arg); + retval = (tty->ops->compat_ioctl)(tty, cmd, arg); if (retval != -ENOIOCTLCMD) return retval; } |