leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: serial: remove hupping check from tiocmiwait

Browse Source 
Since commit 31ca020b ("TTY: wake up processes last at hangup") there no
longer any need to check the hupping flag in the generic tiocmiwait
implementation, so remove it.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2013-06-26 16:47:21 +02:00 committed by Greg Kroah-Hartman
parent a0b9281e29
commit 91c4211c39
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/serial/generic.c
View File

@ -460,12 +460,7 @@ static bool usb_serial_generic_msr_changed(struct tty_struct *tty,
/*
* Use tty-port initialised flag to detect all hangups including the
* one generated at USB-device disconnect.
*
* FIXME: Remove hupping check once tty_port_hangup calls shutdown
* (which clears the initialised flag) before wake up.
*/
if (test_bit(TTY_HUPPING, &tty->flags))
return true;
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
return true;
@ -496,12 +491,8 @@ int usb_serial_generic_tiocmiwait(struct tty_struct *tty, unsigned long arg)
ret = wait_event_interruptible(port->port.delta_msr_wait,
usb_serial_generic_msr_changed(tty, arg, &cnow));
if (!ret) {
if (test_bit(TTY_HUPPING, &tty->flags))
ret = -EIO;
if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
ret = -EIO;
}
if (!ret && !test_bit(ASYNCB_INITIALIZED, &port->port.flags))
ret = -EIO;
return ret;
}