4 files changed, 30 insertions, 25 deletions

diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index e61c36cbb866..c193af6a628f 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c
@@ -636,6 +636,7 @@ struct console xenboot_console = {
         .name           = "xenboot",
         .write          = xenboot_write_console,
         .flags          = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
+        .index          = -1,
 };
 #endif  /* CONFIG_EARLY_PRINTK */
 
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 01bf5eb4f238..7a744b69c3d1 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -2183,28 +2183,34 @@ static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
 
                 if (!input_available_p(tty, 0)) {
                         if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) {
-                                retval = -EIO;
-                                break;
-                        }
-                        if (tty_hung_up_p(file))
-                                break;
-                        if (!timeout)
-                                break;
-                        if (file->f_flags & O_NONBLOCK) {
-                                retval = -EAGAIN;
-                                break;
-                        }
-                        if (signal_pending(current)) {
-                                retval = -ERESTARTSYS;
-                                break;
-                        }
-                        n_tty_set_room(tty);
-                        up_read(&tty->termios_rwsem);
+                                up_read(&tty->termios_rwsem);
+                                tty_flush_to_ldisc(tty);
+                                down_read(&tty->termios_rwsem);
+                                if (!input_available_p(tty, 0)) {
+                                        retval = -EIO;
+                                        break;
+                                }
+                        } else {
+                                if (tty_hung_up_p(file))
+                                        break;
+                                if (!timeout)
+                                        break;
+                                if (file->f_flags & O_NONBLOCK) {
+                                        retval = -EAGAIN;
+                                        break;
+                                }
+                                if (signal_pending(current)) {
+                                        retval = -ERESTARTSYS;
+                                        break;
+                                }
+                                n_tty_set_room(tty);
+                                up_read(&tty->termios_rwsem);
 
-                        timeout = schedule_timeout(timeout);
+                                timeout = schedule_timeout(timeout);
 
-                        down_read(&tty->termios_rwsem);
-                        continue;
+                                down_read(&tty->termios_rwsem);
+                                continue;
+                        }
                 }
                 __set_current_state(TASK_RUNNING);
 
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index a0ebbc9ce5cd..042aa077b5b3 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1912,9 +1912,6 @@ static int serial_imx_probe_dt(struct imx_port *sport,
 
         sport->devdata = of_id->data;
 
-        if (of_device_is_stdout_path(np))
-                add_preferred_console(imx_reg.cons->name, sport->port.line, 0);
-
         return 0;
 }
 #else
diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c
index 93b697a0de65..15ad6fcda88b 100644
--- a/drivers/tty/serial/vt8500_serial.c
+++ b/drivers/tty/serial/vt8500_serial.c
@@ -561,12 +561,13 @@ static int vt8500_serial_probe(struct platform_device *pdev)
         if (!mmres || !irqres)
                 return -ENODEV;
 
-        if (np)
+        if (np) {
                 port = of_alias_get_id(np, "serial");
                 if (port >= VT8500_MAX_PORTS)
                         port = -1;
-        else
+        } else {
                 port = -1;
+        }
 
         if (port < 0) {
                 /* calculate the port id */