summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorKonstantin Shkolnyy <konstantin.shkolnyy@gmail.com>2016-05-04 16:56:52 -0500
committerJohan Hovold <johan@kernel.org>2016-05-05 11:27:02 +0200
commita377f9e906af4df9071ba8ddba60188cb4013d93 (patch)
tree0e7dff3765162cdb64e4f75c48734beb08e3608c /drivers/usb
parent8c34d82e9dc67bb06e20e015ec677f82b72a26b3 (diff)
downloadop-kernel-dev-a377f9e906af4df9071ba8ddba60188cb4013d93.zip
op-kernel-dev-a377f9e906af4df9071ba8ddba60188cb4013d93.tar.gz
USB: serial: cp210x: fix hardware flow-control disable
A bug in the CRTSCTS handling caused RTS to alternate between CRTSCTS=0 => "RTS is transmit active signal" and CRTSCTS=1 => "RTS is used for receive flow control" instead of CRTSCTS=0 => "RTS is statically active" and CRTSCTS=1 => "RTS is used for receive flow control" This only happened after first having enabled CRTSCTS. Signed-off-by: Konstantin Shkolnyy <konstantin.shkolnyy@gmail.com> Fixes: 39a66b8d22a3 ("[PATCH] USB: CP2101 Add support for flow control") Cc: stable <stable@vger.kernel.org> [johan: reword commit message ] Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/cp210x.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index dd47823..fef7a51 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -967,8 +967,7 @@ static void cp210x_set_termios(struct tty_struct *tty,
} else {
modem_ctl[0] &= ~0x7B;
modem_ctl[0] |= 0x01;
- /* FIXME - OR here instead of assignment looks wrong */
- modem_ctl[4] |= 0x40;
+ modem_ctl[4] = 0x40;
dev_dbg(dev, "%s - flow control = NONE\n", __func__);
}
OpenPOWER on IntegriCloud