Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3ebbd300 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit 1007f1d1 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: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibc77017d0655165eb6962bf722c7cbbd8cc17480
parent 5bb7d508

drivers/tty/serial/8250/8250_port.c

+1 −6
Original line number Diff line number Diff line
@@ -3269,13 +3269,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);