Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

[~andy/linux] / drivers / serial / sn_console.c

diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c
index fee6418e84c42abd04b7293e0f47e4caaf307cbe..840815fde49b7e92f099e1e979413691b9a6975c 100644 (file)
--- a/drivers/serial/sn_console.c
+++ b/drivers/serial/sn_console.c
@@ -572,6 +572,7 @@ static void sn_transmit_chars(struct sn_cons_port *port, int raw)
 
        if (uart_circ_empty(xmit) || uart_tx_stopped(&port->sc_port)) {
                /* Nothing to do. */
+               ia64_sn_console_intr_disable(SAL_CONSOLE_INTR_XMIT);
                return;
        }