diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-19 00:30:58 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-19 00:30:58 +0200 |
| commit | 77501f3cb648e18733509a951ed31eddd7ef2c0b (patch) | |
| tree | 82624caa354394df2422562bf6dda56a2c088704 /drivers/serial/sunzilog.c | |
| parent | [libata passthru] update ATAPI completion for new error handling (diff) | |
| parent | [PATCH] libata CHS: reread device identify info (revise #6) (diff) | |
| download | linux-77501f3cb648e18733509a951ed31eddd7ef2c0b.tar.xz linux-77501f3cb648e18733509a951ed31eddd7ef2c0b.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/serial/sunzilog.c')
| -rw-r--r-- | drivers/serial/sunzilog.c | 5 |
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; |