summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorMichael Hanselmann <public@hansmi.ch>2020-07-07 16:53:22 +0200
committerJohan Hovold <johan@kernel.org>2020-07-07 17:32:02 +0200
commit6d0bdc42842a8507c8218244b4ced09ca698d965 (patch)
treeb660b106df91f182ac6fec7ccbc48a0e97bc0ae2 /drivers/usb/serial
parentUSB: serial: cp210x: re-enable auto-RTS on open (diff)
downloadlinux-6d0bdc42842a8507c8218244b4ced09ca698d965.tar.xz
linux-6d0bdc42842a8507c8218244b4ced09ca698d965.zip
USB: serial: ch341: fix missing simulated-break margin
On devices which do not support break signalling a break condition is simulated by sending a NUL byte at the lowest possible speed. The break condition will be 9 bit periods long (start bit and eight data bits), but the transmission itself also includes the stop bit. Add the missing safety margin of one bit which is intended to account for timing differences, and fix up the corresponding comment. Signed-off-by: Michael Hanselmann <public@hansmi.ch> Link: https://lore.kernel.org/r/9909b288-294d-16b9-9f14-51eb79c63b6c@msgid.hansmi.ch [ johan: amend commit message ] Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/ch341.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c
index 011d7953f087..d21427aacee1 100644
--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -604,11 +604,13 @@ static void ch341_simulate_break(struct tty_struct *tty, int break_state)
}
/*
- * Compute expected transmission duration and add a single bit
- * of safety margin (the actual NUL byte transmission is 8 bits
- * plus one stop bit).
+ * Compute expected transmission duration including safety
+ * margin. The original baud rate is only restored after the
+ * computed point in time.
+ *
+ * 11 bits = 1 start, 8 data, 1 stop, 1 margin
*/
- priv->break_end = jiffies + (10 * HZ / CH341_MIN_BPS);
+ priv->break_end = jiffies + (11 * HZ / CH341_MIN_BPS);
return;
}