xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "serial: 8250: Fix restoring termios speed after suspend"

Browse Source 
This reverts commit 8f740c11d8 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 <gregkh@google.com>
Change-Id: Ibc77017d0655165eb6962bf722c7cbbd8cc17480
This commit is contained in:
Greg Kroah-Hartman
2022-10-30 09:33:57 +01:00
parent 0b500f5b16
commit d2bc3376cd
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/tty/serial/8250/8250_port.c
View File

@@ -3288,13 +3288,8 @@ static void serial8250_console_restore(struct uart_8250_port *up)
unsigned int baud, quot, frac = 0; unsigned int baud, quot, frac = 0;
termios.c_cflag = port->cons->cflag; termios.c_cflag = port->cons->cflag;
termios.c_ispeed = port->cons->ispeed; if (port->state->port.tty && termios.c_cflag == 0)
termios.c_ospeed = port->cons->ospeed;
if (port->state->port.tty && termios.c_cflag == 0) {
termios.c_cflag = port->state->port.tty->termios.c_cflag; 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); baud = serial8250_get_baud_rate(port, &termios, NULL);
quot = serial8250_get_divisor(port, baud, &frac); quot = serial8250_get_divisor(port, baud, &frac);