summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorLukas Wunner <lukas@wunner.de>2020-03-27 17:38:15 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-03-27 17:45:54 +0300
commit4e36f94e996ebee8a919c6cd419f55e4d08ad4e3 (patch)
tree5155491341c45236ac34101dbb7d72163c0a0a37 /drivers/tty
parent7cf64b18b0b96e751178b8d0505d8466ff5a448f (diff)
downloadlinux-4e36f94e996ebee8a919c6cd419f55e4d08ad4e3.tar.xz
serial: 8250: Fix rs485 delay after console write
Due to a silly copy-paste mistake, commit 7f9803072ff6 ("serial: 8250: Support console on software emulated rs485 ports") erroneously pauses for the duration of delay_rts_before_send after writing to the console, instead of delay_rts_after_send. Mea culpa. Fixes: 7f9803072ff6 ("serial: 8250: Support console on software emulated rs485 ports") Signed-off-by: Lukas Wunner <lukas@wunner.de> Link: https://lore.kernel.org/r/9dd67f33c90d23f7fafa3b81b1e812ddabf9ca24.1585319447.git.lukas@wunner.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/8250/8250_port.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 2f973280c34a..a1d3aef3c406 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -3271,7 +3271,7 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
serial_port_out(port, UART_IER, ier);
if (em485) {
- mdelay(port->rs485.delay_rts_before_send);
+ mdelay(port->rs485.delay_rts_after_send);
if (em485->tx_stopped)
up->rs485_stop_tx(up);
}