[PATCH 3.10 085/250] USB: serial: ch341: fix open and resume after B0

Path	csiph.com!goblin3!goblin.stu.neva.ru!bolzen.all.de!fu-berlin.de!bofh.it!news.nic.it!robomod
From	Willy Tarreau <w@1wt.eu>
Newsgroups	linux.kernel
Subject	[PATCH 3.10 085/250] USB: serial: ch341: fix open and resume after B0
Date	Thu, 08 Jun 2017 01:10:01 +0200
Message-ID	<tPSfn-4Fa-7@gated-at.bofh.it> (permalink)
References	<tPSfn-4Fa-3@gated-at.bofh.it>
X-Mailer	git-send-email 2.8.0.rc2.1.gbe9624a
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	36
Organization	linux.* mail to news gateway
X-Original-Cc	Johan Hovold <johan@kernel.org>, Willy Tarreau <w@1wt.eu>
X-Original-Date	Thu, 8 Jun 2017 00:57:51 +0200
X-Original-Message-ID	<1496876436-32402-86-git-send-email-w@1wt.eu>
X-Original-References	<1496876436-32402-1-git-send-email-w@1wt.eu>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1660310

Show key headers only | View raw

From: Johan Hovold <johan@kernel.org>

commit a20047f36e2f6a1eea4f1fd261aaa55882369868 upstream.

The private baud_rate variable is used to configure the port at open and
reset-resume and must never be set to (and left at) zero or reset-resume
and all further open attempts will fail.

Fixes: aa91def41a7b ("USB: ch341: set tty baud speed according to tty struct")
Fixes: 664d5df92e88 ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 drivers/usb/serial/ch341.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index db37b16..e9cfd40 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -368,12 +368,11 @@ static void ch341_set_termios(struct tty_struct *tty,
 
 	baud_rate = tty_get_baud_rate(tty);
 
-	priv->baud_rate = baud_rate;
-
 	if (baud_rate) {
 		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;
 		ch341_set_baudrate(port->serial->dev, priv);
 	} else {
 		spin_lock_irqsave(&priv->lock, flags);
-- 
2.8.0.rc2.1.gbe9624a

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.10 085/250] USB: serial: ch341: fix open and resume after B0 Willy Tarreau <w@1wt.eu> - 2017-06-08 01:10 +0200

csiph-web