summaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorMartin Michlmayr <tbm@cyrius.com>2006-03-07 21:04:59 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-03-07 21:04:59 +0000
commitc4432c41b0c74d770ebc5e0a4fc3df3d00dfc131 (patch)
treef47e0db834719e1347a8779483bb06cb848f6243 /drivers/serial
parent7a171cdcb6ce82cc5e4bd7cb8eab172a43395f87 (diff)
downloadop-kernel-dev-c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131.zip
op-kernel-dev-c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131.tar.gz
[SERIAL] ip22zilog: Fix oops on runlevel change with serial console
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
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/ip22zilog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c
index 419dd3c..193722d 100644
--- a/drivers/serial/ip22zilog.c
+++ b/drivers/serial/ip22zilog.c
@@ -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;
OpenPOWER on IntegriCloud