]> err.no Git - linux-2.6/commitdiff
[SERIAL] ip22zilog: Fix oops on runlevel change with serial console
authorMartin Michlmayr <tbm@cyrius.com>
Tue, 7 Mar 2006 21:04:59 +0000 (21:04 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 7 Mar 2006 21:04:59 +0000 (21:04 +0000)
Incorrect uart_write_wakeup() calls cause reference to a NULL tty
pointer.  This has been fixed in the sunsab and sunzilog serial drivers
in October 2005.  Update the ip22zilog, which is based on sunzilog,
accordingly.

Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk
drivers/serial/ip22zilog.c

index 419dd3cd786240f5db8c721877674b83c3c04f4a..193722d680cf25f5ce42b1c1fa0e1c531940ac0b 100644 (file)
@@ -420,10 +420,8 @@ static void ip22zilog_transmit_chars(struct uart_ip22zilog_port *up,
        if (up->port.info == NULL)
                goto ack_tx_int;
        xmit = &up->port.info->xmit;
-       if (uart_circ_empty(xmit)) {
-               uart_write_wakeup(&up->port);
+       if (uart_circ_empty(xmit))
                goto ack_tx_int;
-       }
        if (uart_tx_stopped(&up->port))
                goto ack_tx_int;