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/class/cdc-acm.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/class/cdc-acm.c')
-rw-r--r-- | drivers/usb/class/cdc-acm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index d6ede989ff22..2ae996b7ce7b 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
@@ -776,7 +776,7 @@ static int acm_tty_break_ctl(struct tty_struct *tty, int state) | |||
776 | return retval; | 776 | return retval; |
777 | } | 777 | } |
778 | 778 | ||
779 | static int acm_tty_tiocmget(struct tty_struct *tty, struct file *file) | 779 | static int acm_tty_tiocmget(struct tty_struct *tty) |
780 | { | 780 | { |
781 | struct acm *acm = tty->driver_data; | 781 | struct acm *acm = tty->driver_data; |
782 | 782 | ||