Skip to content

Commit

Permalink
USB: serial: ch341: fix open and resume after B0
Browse files Browse the repository at this point in the history
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: aa91def ("USB: ch341: set tty baud speed according to tty
struct")
Fixes: 664d5df ("USB: usb-serial ch341: support for DTR/RTS/CTS")
Cc: stable <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
  • Loading branch information
jhovold committed Jan 9, 2017
1 parent 4e2da44 commit a20047f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/usb/serial/ch341.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a20047f

Please sign in to comment.