aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-01-06 13:15:10 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-19 14:18:01 -0500
commit4aeab97a051560835668fc5c61eb56b20bd485d0 (patch)
tree889868befbdf4da613d69b67aca55cb1e35dd5c2
parent58ede4beda662c4e1681fee4fae2174028a1a841 (diff)
USB: serial: ch341: fix initial modem-control state
commit 4e2da44691cffbfffb1535f478d19bc2dca3e62b upstream. DTR and RTS will be asserted by the tty-layer when the port is opened and deasserted on close (if HUPCL is set). Make sure the initial state is not-asserted before the port is first opened as well. Fixes: 664d5df92e88 ("USB: usb-serial ch341: support for DTR/RTS/CTS") Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/ch341.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index f139488d0816..6c04c45bcd06 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -253,7 +253,6 @@ static int ch341_port_probe(struct usb_serial_port *port)
253 253
254 spin_lock_init(&priv->lock); 254 spin_lock_init(&priv->lock);
255 priv->baud_rate = DEFAULT_BAUD_RATE; 255 priv->baud_rate = DEFAULT_BAUD_RATE;
256 priv->line_control = CH341_BIT_RTS | CH341_BIT_DTR;
257 256
258 r = ch341_configure(port->serial->dev, priv); 257 r = ch341_configure(port->serial->dev, priv);
259 if (r < 0) 258 if (r < 0)