Commit 91c4211c authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: serial: remove hupping check from tiocmiwait 



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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0b9281e

drivers/usb/serial/generic.c

+2 −11
Original line number Diff line number Diff line
@@ -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))

	if (!ret && !test_bit(ASYNCB_INITIALIZED, &port->port.flags))

		ret = -EIO;

		if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))

			ret = -EIO;

	}



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE