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

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
...@@ -662,7 +662,7 @@ static int oti6858_tiocmiwait(struct tty_struct *tty, unsigned long arg) ...@@ -662,7 +662,7 @@ static int oti6858_tiocmiwait(struct tty_struct *tty, unsigned long arg)
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
while (1) { while (1) {
wait_event_interruptible(port->delta_msr_wait, wait_event_interruptible(port->port.delta_msr_wait,
port->serial->disconnected || port->serial->disconnected ||
priv->status.pin_state != prev); priv->status.pin_state != prev);
if (signal_pending(current)) if (signal_pending(current))
...@@ -747,7 +747,7 @@ static void oti6858_read_int_callback(struct urb *urb) ...@@ -747,7 +747,7 @@ static void oti6858_read_int_callback(struct urb *urb)
if (!priv->transient) { if (!priv->transient) {
if (xs->pin_state != priv->status.pin_state) 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); memcpy(&priv->status, xs, OTI6858_CTRL_PKT_SIZE);
} }
......
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