Merge tag 'for-linus-20160324' of git://git.infradead.org/linux-mtd

[cascardo/linux.git] / drivers / tty / serial / zs.c

diff --git a/drivers/tty/serial/zs.c b/drivers/tty/serial/zs.c
index 2b65bb7..eeefd76 100644 (file)
--- a/drivers/tty/serial/zs.c
+++ b/drivers/tty/serial/zs.c
@@ -1181,6 +1181,10 @@ static void zs_console_write(struct console *co, const char *s,
        if (txint & TxINT_ENAB) {
                zport->regs[1] |= TxINT_ENAB;
                write_zsreg(zport, R1, zport->regs[1]);
+
+               /* Resume any transmission as the TxIP bit won't be set.  */
+               if (!zport->tx_stopped)
+                       zs_raw_transmit_chars(zport);
        }
        spin_unlock_irqrestore(&scc->zlock, flags);
 }