aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Shkolnyy <konstantin.shkolnyy@gmail.com>2016-05-04 16:56:52 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-10-07 15:23:47 +0200
commitf1f1c35ba5496072579ba6c0493e06d8f6597acc (patch)
treef6a7e65163ae998371ffd65e17745457c090c41e
parent7eb0153fc42d98d301a5ca946ed31366cd33526f (diff)
downloadlinux-linaro-stable-f1f1c35ba5496072579ba6c0493e06d8f6597acc.tar.gz
USB: serial: cp210x: fix hardware flow-control disable
commit a377f9e906af4df9071ba8ddba60188cb4013d93 upstream. 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") [johan: reword commit message ] Signed-off-by: Johan Hovold <johan@kernel.org> [johan: backport to 4.4 ] Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/cp210x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
index a2b43a6e7fa7..c33dfff81cd3 100644
--- a/drivers/usb/serial/cp210x.c
+++ b/drivers/usb/serial/cp210x.c
@@ -784,7 +784,7 @@ static void cp210x_set_termios(struct tty_struct *tty,
} else {
modem_ctl[0] &= ~0x7B;
modem_ctl[0] |= 0x01;
- modem_ctl[1] |= 0x40;
+ modem_ctl[1] = 0x40;
dev_dbg(dev, "%s - flow control = NONE\n", __func__);
}