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/char/ttyprintk.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/char/ttyprintk.c')
-rw-r--r-- | drivers/char/ttyprintk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c index c40c1612c8a7..a1f68af4ccf4 100644 --- a/drivers/char/ttyprintk.c +++ b/drivers/char/ttyprintk.c @@ -144,7 +144,7 @@ static int tpk_write_room(struct tty_struct *tty) /* * TTY operations ioctl function. */ -static int tpk_ioctl(struct tty_struct *tty, struct file *file, +static int tpk_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct ttyprintk_port *tpkp = tty->driver_data; |