Commit 11b9225d authored by Johan Hovold's avatar Johan Hovold Committed by Ben Hutchings

USB: serial: ch341: fix open and resume after B0

commit a20047f3 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: aa91def4 ("USB: ch341: set tty baud speed according to tty
struct")
Fixes: 664d5df9 ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 2acf17af
...@@ -366,14 +366,15 @@ static void ch341_set_termios(struct tty_struct *tty, ...@@ -366,14 +366,15 @@ static void ch341_set_termios(struct tty_struct *tty,
baud_rate = tty_get_baud_rate(tty); baud_rate = tty_get_baud_rate(tty);
priv->baud_rate = baud_rate;
ctrl = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX | CH341_LCR_CS8; ctrl = CH341_LCR_ENABLE_RX | CH341_LCR_ENABLE_TX | CH341_LCR_CS8;
if (baud_rate) { if (baud_rate) {
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS); priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
priv->baud_rate = baud_rate;
r = ch341_init_set_baudrate(port->serial->dev, priv, ctrl); r = ch341_init_set_baudrate(port->serial->dev, priv, ctrl);
if (r < 0 && old_termios) { if (r < 0 && old_termios) {
priv->baud_rate = tty_termios_baud_rate(old_termios); priv->baud_rate = tty_termios_baud_rate(old_termios);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment