diff options
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/8250_pnp.c | 2 | ||||
| -rw-r--r-- | drivers/serial/m32r_sio.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/serial/8250_pnp.c b/drivers/serial/8250_pnp.c index 6f09cbd7fc48..97c68d021d28 100644 --- a/drivers/serial/8250_pnp.c +++ b/drivers/serial/8250_pnp.c | |||
| @@ -91,6 +91,8 @@ static const struct pnp_device_id pnp_dev_table[] = { | |||
| 91 | /* Archtek America Corp. */ | 91 | /* Archtek America Corp. */ |
| 92 | /* Archtek SmartLink Modem 3334BT Plug & Play */ | 92 | /* Archtek SmartLink Modem 3334BT Plug & Play */ |
| 93 | { "GVC000F", 0 }, | 93 | { "GVC000F", 0 }, |
| 94 | /* Archtek SmartLink Modem 3334BRV 33.6K Data Fax Voice */ | ||
| 95 | { "GVC0303", 0 }, | ||
| 94 | /* Hayes */ | 96 | /* Hayes */ |
| 95 | /* Hayes Optima 288 V.34-V.FC + FAX + Voice Plug & Play */ | 97 | /* Hayes Optima 288 V.34-V.FC + FAX + Voice Plug & Play */ |
| 96 | { "HAY0001", 0 }, | 98 | { "HAY0001", 0 }, |
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 | ||
