summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2015-12-29 13:36:13 +0100
committerJohan Hovold <johan@kernel.org>2015-12-29 13:43:14 +0100
commit9631595a253e62a2be7476f99a23ade786829d5f (patch)
treeb4b9a2443f454bcf779db223d479bc2260d2b2ba /drivers/usb/serial
parente69f7a6724182e3f3a4f3d73e74c08dd8f657a9d (diff)
downloadblackbird-obmc-linux-9631595a253e62a2be7476f99a23ade786829d5f.tar.gz
blackbird-obmc-linux-9631595a253e62a2be7476f99a23ade786829d5f.zip
USB: mxu11x0: fix modem-control handling on B0-transitions
Make sure to raise DTR and RTS on transitions from B0 and leave the other bits unchanged. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/mxu11x0.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/mxu11x0.c b/drivers/usb/serial/mxu11x0.c
index c6c4776997fc..c408cd7b4dc6 100644
--- a/drivers/usb/serial/mxu11x0.c
+++ b/drivers/usb/serial/mxu11x0.c
@@ -595,7 +595,7 @@ static void mxu1_set_termios(struct tty_struct *tty,
if (C_BAUD(tty) == B0)
mcr &= ~(MXU1_MCR_DTR | MXU1_MCR_RTS);
else if (old_termios && (old_termios->c_cflag & CBAUD) == B0)
- mcr |= ~(MXU1_MCR_DTR | MXU1_MCR_RTS);
+ mcr |= MXU1_MCR_DTR | MXU1_MCR_RTS;
status = mxu1_set_mcr(port, mcr);
if (status)
OpenPOWER on IntegriCloud