diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-16 14:38:58 +1100 |
| commit | 1e1c568d6c66d1e2e345fd15e2a1ceafc5d7e33a (patch) | |
| tree | 0cf88547108a750d6eb910564ef5bf0ffb5ceef3 /arch/mn10300/kernel/mn10300-serial.c | |
| parent | 91cac623262c1c0cd298c5c648a8bd2b647c264d (diff) | |
| parent | 23e0e8afafd9ac065d81506524adf3339584044b (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'arch/mn10300/kernel/mn10300-serial.c')
| -rw-r--r-- | arch/mn10300/kernel/mn10300-serial.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c index aa07d0cd190..59b9c4bf958 100644 --- a/arch/mn10300/kernel/mn10300-serial.c +++ b/arch/mn10300/kernel/mn10300-serial.c @@ -566,6 +566,11 @@ static void mn10300_serial_transmit_interrupt(struct mn10300_serial_port *port) { _enter("%s", port->name); + if (!port->uart.info || !port->uart.info->port.tty) { + mn10300_serial_dis_tx_intr(port); + return; + } + if (uart_tx_stopped(&port->uart) || uart_circ_empty(&port->uart.info->xmit)) mn10300_serial_dis_tx_intr(port); |