summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2014-01-02 22:49:24 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-06 11:05:46 -0800
commit9b39aa6263e96fd35de126ccd205dae6935beef6 (patch)
treeea9c382e65f6a646e04b4fd168b3f8d76ca6ae43
parent88083fd5ed5d3e42050530b4098145562254c20e (diff)
downloadlwn-9b39aa6263e96fd35de126ccd205dae6935beef6.tar.gz
lwn-9b39aa6263e96fd35de126ccd205dae6935beef6.zip
USB: cypress_m8: fix ring-indicator detection and reporting
commit 440ebadeae9298d7de3d4d105342691841ec88d0 upstream. Fix ring-indicator (RI) status-bit definition, which was defined as CTS, effectively preventing RI-changes from being detected while reporting false RI status. This bug predates git. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/cypress_m8.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h
index b461311a2ae7..ce13e61b7d55 100644
--- a/drivers/usb/serial/cypress_m8.h
+++ b/drivers/usb/serial/cypress_m8.h
@@ -63,7 +63,7 @@
#define UART_DSR 0x20 /* data set ready - flow control - device to host */
#define CONTROL_RTS 0x10 /* request to send - flow control - host to device */
#define UART_CTS 0x10 /* clear to send - flow control - device to host */
-#define UART_RI 0x10 /* ring indicator - modem - device to host */
+#define UART_RI 0x80 /* ring indicator - modem - device to host */
#define UART_CD 0x40 /* carrier detect - modem - device to host */
#define CYP_ERROR 0x08 /* received from input report - device to host */
/* Note - the below has nothing to do with the "feature report" reset */