---

yaml
---
r: 248659
b: refs/heads/master
c: c7d7abf
h: refs/heads/master
i:
  248657: 2fe38f2
  248655: f19f3f5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7c31bdb6b2a7118150df1668444fd1b7f1df3b85
+refs/heads/master: c7d7abff40c27f82fe78b1091ab3fad69b2546f9

trunk/drivers/tty/serial/serial_core.c

@@ -172,12 +172,16 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in
 
 	retval = uport->ops->startup(uport);
 	if (retval == 0) {
-		if (init_hw) {
-			/*
-			 * Initialise the hardware port settings.
-			 */
-			uart_change_speed(tty, state, NULL);
+		if (uart_console(uport) && uport->cons->cflag) {
+			tty->termios->c_cflag = uport->cons->cflag;
+			uport->cons->cflag = 0;
+		}
+		/*
+		 * Initialise the hardware port settings.
+		 */
+		uart_change_speed(tty, state, NULL);
 
+		if (init_hw) {
 			/*
 			 * Setup the RTS and DTR signals once the
 			 * port is open and ready to respond.
@@ -1481,22 +1485,12 @@ static void uart_update_termios(struct tty_struct *tty,
 {
 	struct uart_port *port = state->uart_port;
 
-	if (uart_console(port) && port->cons->cflag) {
-		tty->termios->c_cflag = port->cons->cflag;
-		port->cons->cflag = 0;
-	}
-
 	/*
 	 * If the device failed to grab its irq resources,
 	 * or some other error occurred, don't try to talk
 	 * to the port hardware.
 	 */
 	if (!(tty->flags & (1 << TTY_IO_ERROR))) {
-		/*
-		 * Make termios settings take effect.
-		 */
-		uart_change_speed(tty, state, NULL);
-
 		/*
 		 * And finally enable the RTS and DTR signals.
 		 */