diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 2a78c7cd5d30..d3ef0f658303 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -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. diff --git a/include/linux/console.h b/include/linux/console.h index 35e3cc4fb4a6..ec9bdb3d7bab 100644 --- a/include/linux/console.h +++ b/include/linux/console.h @@ -153,8 +153,6 @@ struct console { short flags; short index; int cflag; - uint ispeed; - uint ospeed; void *data; struct console *next; };