Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 215f6f04 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: oti6858: fix TIOCMIWAIT and disconnect 



Use tty-port modem-status-change wait queue on which processes are woken
up at hangup and disconnect.

Currently a process waiting on modem-status changes will not be woken on
device disconnect.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c9f9953

drivers/usb/serial/oti6858.c

+2 −2
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static int oti6858_tiocmiwait(struct tty_struct *tty, unsigned long arg) 
	spin_unlock_irqrestore(&priv->lock, flags);



	while (1) {

		wait_event_interruptible(port->delta_msr_wait,

		wait_event_interruptible(port->port.delta_msr_wait,

					port->serial->disconnected ||

					priv->status.pin_state != prev);

		if (signal_pending(current))
@@ -747,7 +747,7 @@ static void oti6858_read_int_callback(struct urb *urb) 


		if (!priv->transient) {

			if (xs->pin_state != priv->status.pin_state)

				wake_up_interruptible(&port->delta_msr_wait);

				wake_up_interruptible(&port->port.delta_msr_wait);

			memcpy(&priv->status, xs, OTI6858_CTRL_PKT_SIZE);

		}