diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-03-19 09:21:19 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-04-25 20:25:28 +0100 |
| commit | 928ab2854c082067496ca91c0495a60b17d7bf9e (patch) | |
| tree | 4663189faa5aa22c6ac5e15672a57b18e2d0144c /drivers/usb | |
| parent | 4f8adbff06abdb87614b8cfae32d207683400c26 (diff) | |
| download | linux-stable-928ab2854c082067496ca91c0495a60b17d7bf9e.tar.gz linux-stable-928ab2854c082067496ca91c0495a60b17d7bf9e.tar.bz2 linux-stable-928ab2854c082067496ca91c0495a60b17d7bf9e.zip | |
USB: mos7840: fix broken TIOCMIWAIT
commit e670c6af12517d08a403487b1122eecf506021cf upstream.
Make sure waiting processes are woken on modem-status changes.
Currently processes are only woken on termios changes regardless of
whether the modem status has changed.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 43a38aab24e5..30ef604766e6 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -453,6 +453,9 @@ static void mos7840_handle_new_msr(struct moschip_port *port, __u8 new_msr) icount->rng++; smp_wmb(); } + + mos7840_port->delta_msr_cond = 1; + wake_up_interruptible(&mos7840_port->delta_msr_wait); } } @@ -2073,8 +2076,6 @@ static void mos7840_change_port_settings(struct tty_struct *tty, mos7840_port->read_urb_busy = false; } } - wake_up(&mos7840_port->delta_msr_wait); - mos7840_port->delta_msr_cond = 1; dbg("mos7840_change_port_settings mos7840_port->shadowLCR is End %x", mos7840_port->shadowLCR); } |