From: Johan Hovold <johan@kernel.org>
To: linux-usb@vger.kernel.org
Cc: Aidan Thornton <makosoft@gmail.com>,
Grigori Goronzy <greg@chown.ath.cx>,
Karl Palsson <karlp@tweak.net.au>,
Russell Senior <russell@personaltelco.net>,
Eddi De Pieri <eddi@depieri.net>, Johan Hovold <johan@kernel.org>,
stable <stable@vger.kernel.org>
Subject: [PATCH 02/13] USB: serial: ch341: fix open and resume after B0
Date: Wed, 14 Dec 2016 16:27:59 +0100 [thread overview]
Message-ID: <20161214152810.14682-3-johan@kernel.org> (raw)
In-Reply-To: <20161214152810.14682-1-johan@kernel.org>
The private baud_rate variable is used to configure the port at open and
reset-resume, which means it must never be set to (and left at) zero or
reset-resume and all further open attempts will fail.
Fixes: 664d5df92e88 ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/ch341.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index d133e72fe888..6279df905c14 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -355,7 +355,6 @@ static void ch341_set_termios(struct tty_struct *tty,
baud_rate = tty_get_baud_rate(tty);
- priv->baud_rate = baud_rate;
ctrl = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX;
switch (C_CSIZE(tty)) {
@@ -388,6 +387,9 @@ static void ch341_set_termios(struct tty_struct *tty,
spin_lock_irqsave(&priv->lock, flags);
priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS);
spin_unlock_irqrestore(&priv->lock, flags);
+
+ priv->baud_rate = baud_rate;
+
r = ch341_init_set_baudrate(port->serial->dev, priv, ctrl);
if (r < 0 && old_termios) {
priv->baud_rate = tty_termios_baud_rate(old_termios);
--
2.10.2
next prev parent reply other threads:[~2016-12-14 15:28 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20161214152810.14682-1-johan@kernel.org>
2016-12-14 15:27 ` [PATCH 01/13] USB: serial: ch341: fix initial modem-control state Johan Hovold
2016-12-14 15:27 ` Johan Hovold [this message]
2016-12-14 15:28 ` [PATCH 03/13] USB: serial: ch341: fix modem-control and B0 handling Johan Hovold
2016-12-14 15:28 ` [PATCH 04/13] USB: serial: ch341: fix open error handling Johan Hovold
2016-12-14 15:28 ` [PATCH 05/13] USB: serial: ch341: fix resume after reset Johan Hovold
2016-12-14 15:28 ` [PATCH 06/13] USB: serial: ch341: fix initial line settings Johan Hovold
2016-12-16 13:19 ` Aidan Thornton
2016-12-16 14:46 ` Johan Hovold
2016-12-16 16:04 ` Russell Senior
2016-12-16 16:13 ` Johan Hovold
2016-12-16 17:30 ` Johan Hovold
2016-12-17 11:27 ` Russell Senior
2016-12-19 10:58 ` Johan Hovold
2016-12-19 16:40 ` Russell Senior
2016-12-19 22:12 ` Russell Senior
2016-12-20 9:13 ` Johan Hovold
2016-12-20 12:38 ` Russell Senior
2016-12-20 16:07 ` Johan Hovold
2016-12-20 16:13 ` Johan Hovold
2016-12-20 20:09 ` Russell Senior
2016-12-20 20:49 ` Johan Hovold
2017-01-09 13:51 ` Johan Hovold
2017-01-12 14:49 ` Johan Hovold
2016-12-20 15:31 ` Russell Senior
2016-12-20 15:52 ` Johan Hovold
2016-12-20 20:05 ` Russell Senior
2016-12-20 8:42 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161214152810.14682-3-johan@kernel.org \
--to=johan@kernel.org \
--cc=eddi@depieri.net \
--cc=greg@chown.ath.cx \
--cc=karlp@tweak.net.au \
--cc=linux-usb@vger.kernel.org \
--cc=makosoft@gmail.com \
--cc=russell@personaltelco.net \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).