diff options
| author | Martin Michlmayr <tbm@cyrius.com> | 2006-03-07 22:04:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-03-07 22:04:59 +0100 |
| commit | c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131 (patch) | |
| tree | f47e0db834719e1347a8779483bb06cb848f6243 /drivers/serial/ip22zilog.c | |
| parent | [SERIAL] Fix two bugs in parport_serial (diff) | |
| download | linux-c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131.tar.xz linux-c4432c41b0c74d770ebc5e0a4fc3df3d00dfc131.zip | |
[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/ip22zilog.c')
| -rw-r--r-- | drivers/serial/ip22zilog.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/ip22zilog.c b/drivers/serial/ip22zilog.c index 419dd3cd7862..193722d680cf 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; |