USB: cypress_m8: 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>

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index 558605d646f34432766b736c9b3d430e8a32a871..07e0033986138b9d3acf00a1c9a56dbcc768d71f 100644 (file)
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -1187,7 +1187,10 @@ static void cypress_read_int_callback(struct urb *urb)
        if (priv->current_status != priv->prev_status) {
                priv->diff_status |= priv->current_status ^
                        priv->prev_status;
-               wake_up_interruptible(&port->port.delta_msr_wait);
+
+               if (priv->diff_status & UART_MSR_MASK)
+                       wake_up_interruptible(&port->port.delta_msr_wait);
+
                priv->prev_status = priv->current_status;
        }
        spin_unlock_irqrestore(&priv->lock, flags);

diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h
index 68bfd5197a63ce8f56e829ca0692f784c39a0de8..119d2e17077b1ec8885f85e0a5defa3b90352e3d 100644 (file)
--- a/drivers/usb/serial/cypress_m8.h
+++ b/drivers/usb/serial/cypress_m8.h
@@ -66,6 +66,7 @@
 #define CONTROL_RTS    0x10    /* request to send */
 #define CONTROL_RESET  0x08    /* sent with output report */
 
+#define UART_MSR_MASK  0xf0
 #define UART_RI                0x80    /* ring indicator */
 #define UART_CD                0x40    /* carrier detect */
 #define UART_DSR       0x20    /* data set ready */