diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 18:30:58 -0400 |
| commit | 77501f3cb648e18733509a951ed31eddd7ef2c0b (patch) | |
| tree | 82624caa354394df2422562bf6dda56a2c088704 /drivers/serial/sunzilog.c | |
| parent | 422fa08e538b649a9b80258950d2f8a202f45f19 (diff) | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
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, | |||
| 517 | if (up->port.info == NULL) | 517 | if (up->port.info == NULL) |
| 518 | goto ack_tx_int; | 518 | goto ack_tx_int; |
| 519 | xmit = &up->port.info->xmit; | 519 | xmit = &up->port.info->xmit; |
| 520 | if (uart_circ_empty(xmit)) { | 520 | if (uart_circ_empty(xmit)) |
| 521 | uart_write_wakeup(&up->port); | ||
| 522 | goto ack_tx_int; | 521 | goto ack_tx_int; |
| 523 | } | 522 | |
| 524 | if (uart_tx_stopped(&up->port)) | 523 | if (uart_tx_stopped(&up->port)) |
| 525 | goto ack_tx_int; | 524 | goto ack_tx_int; |
| 526 | 525 | ||