projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
drivers
/
serial
/
sunzilog.c
diff --git
a/drivers/serial/sunzilog.c
b/drivers/serial/sunzilog.c
index
d754457
..
7653d6c
100644
(file)
--- 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;