projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 7e0d956d GKH |
1 | From 030ee7ae52a46a2be52ccc8242c4a330aba8d38e Mon Sep 17 00:00:00 2001 |
| 2 | From: Johan Hovold <johan@kernel.org> | |
| 3 | Date: Fri, 6 Jan 2017 19:15:12 +0100 | |
| 4 | Subject: USB: serial: ch341: fix modem-control and B0 handling | |
| 5 | ||
| 6 | From: Johan Hovold <johan@kernel.org> | |
| 7 | ||
| 8 | commit 030ee7ae52a46a2be52ccc8242c4a330aba8d38e upstream. | |
| 9 | ||
| 10 | The modem-control signals are managed by the tty-layer during open and | |
| 11 | should not be asserted prematurely when set_termios is called from | |
| 12 | driver open. | |
| 13 | ||
| 14 | Also make sure that the signals are asserted only when changing speed | |
| 15 | from B0. | |
| 16 | ||
| 17 | Fixes: 664d5df92e88 ("USB: usb-serial ch341: support for DTR/RTS/CTS") | |
| 18 | Signed-off-by: Johan Hovold <johan@kernel.org> | |
| 19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 20 | ||
| 21 | --- | |
| 22 | drivers/usb/serial/ch341.c | 18 +++++++++--------- | |
| 23 | 1 file changed, 9 insertions(+), 9 deletions(-) | |
| 24 | ||
| 25 | --- a/drivers/usb/serial/ch341.c | |
| 26 | +++ b/drivers/usb/serial/ch341.c | |
| 27 | @@ -362,24 +362,24 @@ static void ch341_set_termios(struct tty | |
| 28 | baud_rate = tty_get_baud_rate(tty); | |
| 29 | ||
| 30 | if (baud_rate) { | |
| 31 | - spin_lock_irqsave(&priv->lock, flags); | |
| 32 | - priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS); | |
| 33 | - spin_unlock_irqrestore(&priv->lock, flags); | |
| 34 | priv->baud_rate = baud_rate; | |
| 35 | ch341_set_baudrate(port->serial->dev, priv); | |
| 36 | - } else { | |
| 37 | - spin_lock_irqsave(&priv->lock, flags); | |
| 38 | - priv->line_control &= ~(CH341_BIT_DTR | CH341_BIT_RTS); | |
| 39 | - spin_unlock_irqrestore(&priv->lock, flags); | |
| 40 | } | |
| 41 | ||
| 42 | - ch341_set_handshake(port->serial->dev, priv->line_control); | |
| 43 | - | |
| 44 | /* Unimplemented: | |
| 45 | * (cflag & CSIZE) : data bits [5, 8] | |
| 46 | * (cflag & PARENB) : parity {NONE, EVEN, ODD} | |
| 47 | * (cflag & CSTOPB) : stop bits [1, 2] | |
| 48 | */ | |
| 49 | + | |
| 50 | + spin_lock_irqsave(&priv->lock, flags); | |
| 51 | + if (C_BAUD(tty) == B0) | |
| 52 | + priv->line_control &= ~(CH341_BIT_DTR | CH341_BIT_RTS); | |
| 53 | + else if (old_termios && (old_termios->c_cflag & CBAUD) == B0) | |
| 54 | + priv->line_control |= (CH341_BIT_DTR | CH341_BIT_RTS); | |
| 55 | + spin_unlock_irqrestore(&priv->lock, flags); | |
| 56 | + | |
| 57 | + ch341_set_handshake(port->serial->dev, priv->line_control); | |
| 58 | } | |
| 59 | ||
| 60 | static void ch341_break_ctl(struct tty_struct *tty, int break_state) |