diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:02:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:02:24 -0400 |
| commit | 24c83d45d76303db8325b8553a05c69c838ef370 (patch) | |
| tree | 50c90d1c9b05aeec86e046f7d0f758b40c6d05ce /drivers/serial | |
| parent | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (diff) | |
| parent | 66172d259b816cbb65878a05d30771935a6928e8 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/serial_lh7a40x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/serial_lh7a40x.c b/drivers/serial/serial_lh7a40x.c index 32f808d157a1..8302376800c0 100644 --- a/drivers/serial/serial_lh7a40x.c +++ b/drivers/serial/serial_lh7a40x.c | |||
| @@ -207,7 +207,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port) | |||
| 207 | return; | 207 | return; |
| 208 | } | 208 | } |
| 209 | if (uart_circ_empty (xmit) || uart_tx_stopped (port)) { | 209 | if (uart_circ_empty (xmit) || uart_tx_stopped (port)) { |
| 210 | lh7a40xuart_stop_tx (port, 0); | 210 | lh7a40xuart_stop_tx (port); |
| 211 | return; | 211 | return; |
| 212 | } | 212 | } |
| 213 | 213 | ||
| @@ -229,7 +229,7 @@ static void lh7a40xuart_tx_chars (struct uart_port* port) | |||
| 229 | uart_write_wakeup (port); | 229 | uart_write_wakeup (port); |
| 230 | 230 | ||
| 231 | if (uart_circ_empty (xmit)) | 231 | if (uart_circ_empty (xmit)) |
| 232 | lh7a40xuart_stop_tx (port, 0); | 232 | lh7a40xuart_stop_tx (port); |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | static void lh7a40xuart_modem_status (struct uart_port* port) | 235 | static void lh7a40xuart_modem_status (struct uart_port* port) |