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

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

Revert "serial: core: Fix initializing and restoring termios speed" 



This reverts commit cac21c3e which is
commit 027b57170bf8bb6999a28e4a5f3d78bf1db0f90c upstream.

It breaks the kernel abi and is not something that is necessary in
Android systems, so it is safe to revert.

Bug: 161946584
Fixes: e9adf72bdbd5 ("serial: core: Fix initializing and restoring termios speed")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I158a28eb7a1ac7892c836abcdbc178129de69391
parent a0518f52

drivers/tty/serial/serial_core.c

+2 −14
Original line number Diff line number Diff line
@@ -219,11 +219,7 @@ static int uart_port_startup(struct tty_struct *tty, struct uart_state *state, 
	if (retval == 0) {

		if (uart_console(uport) && uport->cons->cflag) {

			tty->termios.c_cflag = uport->cons->cflag;

			tty->termios.c_ispeed = uport->cons->ispeed;

			tty->termios.c_ospeed = uport->cons->ospeed;

			uport->cons->cflag = 0;

			uport->cons->ispeed = 0;

			uport->cons->ospeed = 0;

		}

		/*

		 * Initialise the hardware port settings.
@@ -291,11 +287,8 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state) 
		/*

		 * Turn off DTR and RTS early.

		 */

		if (uport && uart_console(uport) && tty) {

		if (uport && uart_console(uport) && tty)

			uport->cons->cflag = tty->termios.c_cflag;

			uport->cons->ispeed = tty->termios.c_ispeed;

			uport->cons->ospeed = tty->termios.c_ospeed;

		}



		if (!tty || C_HUPCL(tty))

			uart_port_dtr_rts(uport, 0);
@@ -2069,11 +2062,8 @@ uart_set_options(struct uart_port *port, struct console *co, 
	 * Allow the setting of the UART parameters with a NULL console

	 * too:

	 */

	if (co) {

	if (co)

		co->cflag = termios.c_cflag;

		co->ispeed = termios.c_ispeed;

		co->ospeed = termios.c_ospeed;

	}



	return 0;

}
@@ -2207,8 +2197,6 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) 
		 */

		memset(&termios, 0, sizeof(struct ktermios));

		termios.c_cflag = uport->cons->cflag;

		termios.c_ispeed = uport->cons->ispeed;

		termios.c_ospeed = uport->cons->ospeed;



		/*

		 * If that's unset, use the tty termios setting.

include/linux/console.h

+0 −2
Original line number Diff line number Diff line
@@ -153,8 +153,6 @@ struct console { 
	short	flags;

	short	index;

	int	cflag;

	uint	ispeed;

	uint	ospeed;

	void	*data;

	struct	 console *next;

};