diff options
| author | Linus Torvalds | 2005-10-12 01:39:24 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-10-12 01:39:24 +0200 |
| commit | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (patch) | |
| tree | c6f31816e5a5afc84e920c6c3f5702327dd990de /drivers | |
| parent | [PATCH] Don't map the same page too much (diff) | |
| parent | [SPARC64]: Fix net booting on Ultra5 (diff) | |
| download | kernel-qcow2-linux-da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89.tar.gz kernel-qcow2-linux-da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89.tar.xz kernel-qcow2-linux-da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89.zip | |
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, if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { up->interrupt_mask1 |= SAB82532_IMR1_XPR; writeb(up->interrupt_mask1, &up->regs->w.imr1); - uart_write_wakeup(&up->port); return; } 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; |