diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/serial/ip22zilog.c | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
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, | |||
| 420 | if (up->port.info == NULL) | 420 | if (up->port.info == NULL) |
| 421 | goto ack_tx_int; | 421 | goto ack_tx_int; |
| 422 | xmit = &up->port.info->xmit; | 422 | xmit = &up->port.info->xmit; |
| 423 | if (uart_circ_empty(xmit)) { | 423 | if (uart_circ_empty(xmit)) |
| 424 | uart_write_wakeup(&up->port); | ||
| 425 | goto ack_tx_int; | 424 | goto ack_tx_int; |
| 426 | } | ||
| 427 | if (uart_tx_stopped(&up->port)) | 425 | if (uart_tx_stopped(&up->port)) |
| 428 | goto ack_tx_int; | 426 | goto ack_tx_int; |
| 429 | 427 | ||