From d2bc3376cd310697a8eafd86cd9867b9e2a40d21 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 30 Oct 2022 09:33:57 +0100 Subject: [PATCH] Revert "serial: 8250: Fix restoring termios speed after suspend" This reverts commit 8f740c11d89157bd74849ae388288075e05e2a34 which is commit 379a33786d489ab81885ff0b3935cfeb36137fea upstream. It breaks the build due to a dependant upstream patch being reverted earlier in the Android tree because of ABI breakages and it not being needed at all. So it is safe to remove here as well. Signed-off-by: Greg Kroah-Hartman Change-Id: Ibc77017d0655165eb6962bf722c7cbbd8cc17480 --- drivers/tty/serial/8250/8250_port.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 71d143c00248..3caa4aa193f6 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -3288,13 +3288,8 @@ static void serial8250_console_restore(struct uart_8250_port *up) unsigned int baud, quot, frac = 0; termios.c_cflag = port->cons->cflag; - termios.c_ispeed = port->cons->ispeed; - termios.c_ospeed = port->cons->ospeed; - if (port->state->port.tty && termios.c_cflag == 0) { + if (port->state->port.tty && termios.c_cflag == 0) termios.c_cflag = port->state->port.tty->termios.c_cflag; - termios.c_ispeed = port->state->port.tty->termios.c_ispeed; - termios.c_ospeed = port->state->port.tty->termios.c_ospeed; - } baud = serial8250_get_baud_rate(port, &termios, NULL); quot = serial8250_get_divisor(port, baud, &frac);