diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:26:14 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:47:33 -0500 |
commit | 60b33c133ca0b7c0b6072c87234b63fee6e80558 (patch) | |
tree | 379340a7ab563df42ddb2907be6f282202244077 /drivers/usb/serial/keyspan.c | |
parent | adf9251fe9b87b5a50deebe489db2df8df4715fc (diff) |
tiocmget: kill off the passing of the struct file
We don't actually need this and it causes problems for internal use of
this functionality. Currently there is a single use of the FILE * pointer.
That is the serial core which uses it to check tty_hung_up_p. However if
that is true then IO_ERROR is also already set so the check may be removed.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
-rw-r--r-- | drivers/usb/serial/keyspan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 0791778a66f3..1beebbb7a20a 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c | |||
@@ -301,7 +301,7 @@ static void keyspan_set_termios(struct tty_struct *tty, | |||
301 | keyspan_send_setup(port, 0); | 301 | keyspan_send_setup(port, 0); |
302 | } | 302 | } |
303 | 303 | ||
304 | static int keyspan_tiocmget(struct tty_struct *tty, struct file *file) | 304 | static int keyspan_tiocmget(struct tty_struct *tty) |
305 | { | 305 | { |
306 | struct usb_serial_port *port = tty->driver_data; | 306 | struct usb_serial_port *port = tty->driver_data; |
307 | struct keyspan_port_private *p_priv = usb_get_serial_port_data(port); | 307 | struct keyspan_port_private *p_priv = usb_get_serial_port_data(port); |