USB: serial: ch341: fix line settings after reset-resume
A recent change added support for modifying the default line-control
settings, but did not make sure that the modified settings were used as
part of reconfiguration after a device has been reset during resume.
This caused a port that was open before suspend to be unusable until
being closed and reopened.
Fixes: ba781bdf86
("USB: serial: ch341: add support for parity, frame
length, stop bits")
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Родитель
ce5e292828
Коммит
3cca8624b6
|
@ -95,6 +95,7 @@ struct ch341_private {
|
|||
unsigned baud_rate; /* set baud rate */
|
||||
u8 line_control; /* set line control value RTS/DTR */
|
||||
u8 line_status; /* active status of modem control inputs */
|
||||
u8 lcr;
|
||||
};
|
||||
|
||||
static void ch341_set_termios(struct tty_struct *tty,
|
||||
|
@ -232,7 +233,7 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv)
|
|||
if (r < 0)
|
||||
goto out;
|
||||
|
||||
r = ch341_init_set_baudrate(dev, priv, 0);
|
||||
r = ch341_init_set_baudrate(dev, priv, priv->lcr);
|
||||
if (r < 0)
|
||||
goto out;
|
||||
|
||||
|
@ -397,6 +398,8 @@ static void ch341_set_termios(struct tty_struct *tty,
|
|||
if (r < 0 && old_termios) {
|
||||
priv->baud_rate = tty_termios_baud_rate(old_termios);
|
||||
tty_termios_copy_hw(&tty->termios, old_termios);
|
||||
} else if (r == 0) {
|
||||
priv->lcr = ctrl;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче