diff options
Diffstat (limited to 'drivers/usb/serial/ark3116.c')
-rw-r--r-- | drivers/usb/serial/ark3116.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index a9c2dec8e3fb..547c9448c28c 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
@@ -50,7 +50,7 @@ static int debug; | |||
50 | /* usb timeout of 1 second */ | 50 | /* usb timeout of 1 second */ |
51 | #define ARK_TIMEOUT (1*HZ) | 51 | #define ARK_TIMEOUT (1*HZ) |
52 | 52 | ||
53 | static struct usb_device_id id_table [] = { | 53 | static const struct usb_device_id id_table[] = { |
54 | { USB_DEVICE(0x6547, 0x0232) }, | 54 | { USB_DEVICE(0x6547, 0x0232) }, |
55 | { USB_DEVICE(0x18ec, 0x3118) }, /* USB to IrDA adapter */ | 55 | { USB_DEVICE(0x18ec, 0x3118) }, /* USB to IrDA adapter */ |
56 | { }, | 56 | { }, |
@@ -733,7 +733,6 @@ static void ark3116_read_bulk_callback(struct urb *urb) | |||
733 | 733 | ||
734 | tty = tty_port_tty_get(&port->port); | 734 | tty = tty_port_tty_get(&port->port); |
735 | if (tty) { | 735 | if (tty) { |
736 | tty_buffer_request_room(tty, urb->actual_length + 1); | ||
737 | /* overrun is special, not associated with a char */ | 736 | /* overrun is special, not associated with a char */ |
738 | if (unlikely(lsr & UART_LSR_OE)) | 737 | if (unlikely(lsr & UART_LSR_OE)) |
739 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | 738 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); |