diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-11 19:39:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-11 19:39:24 -0400 |
| commit | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (patch) | |
| tree | c6f31816e5a5afc84e920c6c3f5702327dd990de /drivers | |
| parent | f5154a98a1931641f0448f6512294a15279110d7 (diff) | |
| parent | b1b510aa284af1908d5d369d52f7dae16aaabd71 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/sunsab.c | 1 | ||||
| -rw-r--r-- | drivers/serial/sunzilog.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c index e971156daa60..ba9381fd3f2d 100644 --- a/drivers/serial/sunsab.c +++ b/drivers/serial/sunsab.c | |||
| @@ -274,7 +274,6 @@ static void transmit_chars(struct uart_sunsab_port *up, | |||
| 274 | if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { | 274 | if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { |
| 275 | up->interrupt_mask1 |= SAB82532_IMR1_XPR; | 275 | up->interrupt_mask1 |= SAB82532_IMR1_XPR; |
| 276 | writeb(up->interrupt_mask1, &up->regs->w.imr1); | 276 | writeb(up->interrupt_mask1, &up->regs->w.imr1); |
| 277 | uart_write_wakeup(&up->port); | ||
| 278 | return; | 277 | return; |
| 279 | } | 278 | } |
| 280 | 279 | ||
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 | ||