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

Commit 3018bb51 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: f81232: 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 4bb4e638

drivers/usb/serial/f81232.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -110,7 +110,7 @@ static void f81232_process_read_urb(struct urb *urb) 
	line_status = priv->line_status;

	line_status = priv->line_status;

	priv->line_status &= ~UART_STATE_TRANSIENT_MASK;

	priv->line_status &= ~UART_STATE_TRANSIENT_MASK;

	spin_unlock_irqrestore(&priv->lock, flags);

	spin_unlock_irqrestore(&priv->lock, flags);

	wake_up_interruptible(&port->delta_msr_wait);

	wake_up_interruptible(&port->port.delta_msr_wait);





	if (!urb->actual_length)

	if (!urb->actual_length)

		return;

		return;
@@ -256,7 +256,7 @@ static int f81232_tiocmiwait(struct tty_struct *tty, unsigned long arg) 
	spin_unlock_irqrestore(&priv->lock, flags);

	spin_unlock_irqrestore(&priv->lock, flags);





	while (1) {

	while (1) {

		interruptible_sleep_on(&port->delta_msr_wait);

		interruptible_sleep_on(&port->port.delta_msr_wait);

		/* see if a signal did it */

		/* see if a signal did it */

		if (signal_pending(current))

		if (signal_pending(current))

			return -ERESTARTSYS;

			return -ERESTARTSYS;