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/opticon.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/opticon.c')
-rw-r--r-- | drivers/usb/serial/opticon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index eda1f9266c4e..e305df807396 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
@@ -352,7 +352,7 @@ static void opticon_unthrottle(struct tty_struct *tty) | |||
352 | } | 352 | } |
353 | } | 353 | } |
354 | 354 | ||
355 | static int opticon_tiocmget(struct tty_struct *tty, struct file *file) | 355 | static int opticon_tiocmget(struct tty_struct *tty) |
356 | { | 356 | { |
357 | struct usb_serial_port *port = tty->driver_data; | 357 | struct usb_serial_port *port = tty->driver_data; |
358 | struct opticon_private *priv = usb_get_serial_data(port->serial); | 358 | struct opticon_private *priv = usb_get_serial_data(port->serial); |