diff options
| author | Johan Hovold <jhovold@gmail.com> | 2014-01-02 22:49:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-01-03 12:42:24 -0800 |
| commit | 1acc36e9c8dcd44f0978c9270e24daa83f343f85 (patch) | |
| tree | 833e2d0186062db120b878f902cbb13f6821e730 /drivers/usb | |
| parent | 271ec2d2d7bd4ab528a7a94701503df06ca8fd52 (diff) | |
USB: oti6858: only wake up MSR queue on changes
Only wake up MSR wait queue on actual modem-status changes.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/oti6858.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 1dea599bb71b..9ea15e0a22d8 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c @@ -103,6 +103,7 @@ struct oti6858_control_pkt { #define TX_BUFFER_EMPTIED 0x09 u8 pin_state; #define PIN_MASK 0x3f +#define PIN_MSR_MASK 0x1b #define PIN_RTS 0x20 /* output pin */ #define PIN_CTS 0x10 /* input pin, active low */ #define PIN_DSR 0x08 /* input pin, active low */ @@ -739,8 +740,11 @@ static void oti6858_read_int_callback(struct urb *urb) } if (!priv->transient) { - if (xs->pin_state != priv->status.pin_state) + u8 delta = xs->pin_state ^ priv->status.pin_state; + + if (delta & PIN_MSR_MASK) wake_up_interruptible(&port->port.delta_msr_wait); + memcpy(&priv->status, xs, OTI6858_CTRL_PKT_SIZE); } |