diff options
Diffstat (limited to 'drivers/usb/serial/empeg.c')
-rw-r--r-- | drivers/usb/serial/empeg.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/usb/serial/empeg.c b/drivers/usb/serial/empeg.c index 7dd0e3eadbe6..5f740a1eacab 100644 --- a/drivers/usb/serial/empeg.c +++ b/drivers/usb/serial/empeg.c | |||
@@ -93,7 +93,7 @@ static void empeg_init_termios(struct tty_struct *tty); | |||
93 | static void empeg_write_bulk_callback(struct urb *urb); | 93 | static void empeg_write_bulk_callback(struct urb *urb); |
94 | static void empeg_read_bulk_callback(struct urb *urb); | 94 | static void empeg_read_bulk_callback(struct urb *urb); |
95 | 95 | ||
96 | static struct usb_device_id id_table [] = { | 96 | static const struct usb_device_id id_table[] = { |
97 | { USB_DEVICE(EMPEG_VENDOR_ID, EMPEG_PRODUCT_ID) }, | 97 | { USB_DEVICE(EMPEG_VENDOR_ID, EMPEG_PRODUCT_ID) }, |
98 | { } /* Terminating entry */ | 98 | { } /* Terminating entry */ |
99 | }; | 99 | }; |
@@ -346,7 +346,6 @@ static void empeg_read_bulk_callback(struct urb *urb) | |||
346 | tty = tty_port_tty_get(&port->port); | 346 | tty = tty_port_tty_get(&port->port); |
347 | 347 | ||
348 | if (urb->actual_length) { | 348 | if (urb->actual_length) { |
349 | tty_buffer_request_room(tty, urb->actual_length); | ||
350 | tty_insert_flip_string(tty, data, urb->actual_length); | 349 | tty_insert_flip_string(tty, data, urb->actual_length); |
351 | tty_flip_buffer_push(tty); | 350 | tty_flip_buffer_push(tty); |
352 | bytes_in += urb->actual_length; | 351 | bytes_in += urb->actual_length; |