diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 00:26:33 -0400 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /drivers/serial/m32r_sio.c | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/serial/m32r_sio.c')
| -rw-r--r-- | drivers/serial/m32r_sio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 348ee2c19b58..c2bb11c02bde 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
| @@ -421,7 +421,7 @@ static void transmit_chars(struct uart_sio_port *up) | |||
| 421 | up->port.icount.tx++; | 421 | up->port.icount.tx++; |
| 422 | if (uart_circ_empty(xmit)) | 422 | if (uart_circ_empty(xmit)) |
| 423 | break; | 423 | break; |
| 424 | while (!serial_in(up, UART_LSR) & UART_LSR_THRE); | 424 | while (!(serial_in(up, UART_LSR) & UART_LSR_THRE)); |
| 425 | 425 | ||
| 426 | } while (--count > 0); | 426 | } while (--count > 0); |
| 427 | 427 | ||