diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/serial/sunzilog.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
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 | ||