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 /net/bluetooth/rfcomm | |
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 'net/bluetooth/rfcomm')
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 8e78e7447726..b1805ff95415 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
@@ -830,7 +830,7 @@ static int rfcomm_tty_write_room(struct tty_struct *tty) | |||
830 | return room; | 830 | return room; |
831 | } | 831 | } |
832 | 832 | ||
833 | static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) | 833 | static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) |
834 | { | 834 | { |
835 | BT_DBG("tty %p cmd 0x%02x", tty, cmd); | 835 | BT_DBG("tty %p cmd 0x%02x", tty, cmd); |
836 | 836 | ||