Commit 6d0cad65 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: pl2303: 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 824d11be
...@@ -607,7 +607,7 @@ static int pl2303_tiocmiwait(struct tty_struct *tty, unsigned long arg) ...@@ -607,7 +607,7 @@ static int pl2303_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;
...@@ -718,7 +718,7 @@ static void pl2303_update_line_status(struct usb_serial_port *port, ...@@ -718,7 +718,7 @@ static void pl2303_update_line_status(struct usb_serial_port *port,
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
if (priv->line_status & UART_BREAK_ERROR) if (priv->line_status & UART_BREAK_ERROR)
usb_serial_handle_break(port); usb_serial_handle_break(port);
wake_up_interruptible(&port->delta_msr_wait); wake_up_interruptible(&port->port.delta_msr_wait);
tty = tty_port_tty_get(&port->port); tty = tty_port_tty_get(&port->port);
if (!tty) if (!tty)
...@@ -782,7 +782,7 @@ static void pl2303_process_read_urb(struct urb *urb) ...@@ -782,7 +782,7 @@ static void pl2303_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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment