summaryrefslogtreecommitdiffstats
path: root/drivers/serial/sunzilog.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2005-10-10 20:43:22 -0700
committerDavid S. Miller <davem@davemloft.net>2005-10-10 20:43:22 -0700
commitb8df110fea555d5088bba67f446c2435104405be (patch)
tree1bb8dfc1a6eadcab3e6df99aff4ae6cde38e94b4 /drivers/serial/sunzilog.c
parent907a42617970a159361f17ef9a63f04d276995ab (diff)
downloadlinux-b8df110fea555d5088bba67f446c2435104405be.tar.gz
linux-b8df110fea555d5088bba67f446c2435104405be.tar.bz2
linux-b8df110fea555d5088bba67f446c2435104405be.zip
[SPARC64]: Fix oops on runlevel change with serial console.
Incorrect uart_write_wakeup() calls cause reference to a NULL tty pointer in sunsab and sunzilog serial drivers. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/serial/sunzilog.c')
-rw-r--r--drivers/serial/sunzilog.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index d75445738c88..7653d6cf05af 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -517,10 +517,9 @@ static void sunzilog_transmit_chars(struct uart_sunzilog_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;