diff options
author | Johan Hovold <johan@kernel.org> | 2017-01-06 13:15:11 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-19 14:18:02 -0500 |
commit | 0556a65e8b7d562ad99f10f36a59f7c87af0ca55 (patch) | |
tree | 1e895cc76da64fb9216f07a5b4af29a1da1f8255 | |
parent | 3ed1f6da3a179cde1ccb3d72fe8a0f1d169f9800 (diff) |
USB: serial: ch341: fix open and resume after B0
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/serial/ch341.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 517671522fe8..22b2c464b468 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
@@ -361,12 +361,11 @@ static void ch341_set_termios(struct tty_struct *tty, | |||
361 | 361 | ||
362 | baud_rate = tty_get_baud_rate(tty); | 362 | baud_rate = tty_get_baud_rate(tty); |
363 | 363 | ||
364 | priv->baud_rate = baud_rate; | ||
365 | |||
366 | if (baud_rate) { | 364 | if (baud_rate) { |
367 | spin_lock_irqsave(&priv->lock, flags); | 365 | spin_lock_irqsave(&priv->lock, flags); |
368 | priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS); | 366 | priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS); |
369 | spin_unlock_irqrestore(&priv->lock, flags); | 367 | spin_unlock_irqrestore(&priv->lock, flags); |
368 | priv->baud_rate = baud_rate; | ||
370 | ch341_set_baudrate(port->serial->dev, priv); | 369 | ch341_set_baudrate(port->serial->dev, priv); |
371 | } else { | 370 | } else { |
372 | spin_lock_irqsave(&priv->lock, flags); | 371 | spin_lock_irqsave(&priv->lock, flags); |