diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-21 12:37:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-25 21:52:25 +0100 |
| commit | 215f6f04668e80543995300c9528ac0143fcda7f (patch) | |
| tree | 0e71138dac557ce29bf56f8264eeeb54d1f53171 /drivers/usb/serial | |
| parent | USB: oti6858: replace custom ioctl operation with tiocmiwait (diff) | |
| download | linux-215f6f04668e80543995300c9528ac0143fcda7f.tar.xz linux-215f6f04668e80543995300c9528ac0143fcda7f.zip | |
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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
| -rw-r--r-- | drivers/usb/serial/oti6858.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index fd5dcb878fa5..7e3e0782e51f 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c @@ -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); } |