diff options
Diffstat (limited to 'drivers/usb/serial/cyberjack.c')
-rw-r--r-- | drivers/usb/serial/cyberjack.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c index b0f6402a91ca..f744ab7a3b19 100644 --- a/drivers/usb/serial/cyberjack.c +++ b/drivers/usb/serial/cyberjack.c | |||
@@ -70,7 +70,7 @@ static void cyberjack_read_int_callback(struct urb *urb); | |||
70 | static void cyberjack_read_bulk_callback(struct urb *urb); | 70 | static void cyberjack_read_bulk_callback(struct urb *urb); |
71 | static void cyberjack_write_bulk_callback(struct urb *urb); | 71 | static void cyberjack_write_bulk_callback(struct urb *urb); |
72 | 72 | ||
73 | static struct usb_device_id id_table [] = { | 73 | static const struct usb_device_id id_table[] = { |
74 | { USB_DEVICE(CYBERJACK_VENDOR_ID, CYBERJACK_PRODUCT_ID) }, | 74 | { USB_DEVICE(CYBERJACK_VENDOR_ID, CYBERJACK_PRODUCT_ID) }, |
75 | { } /* Terminating entry */ | 75 | { } /* Terminating entry */ |
76 | }; | 76 | }; |
@@ -391,11 +391,10 @@ static void cyberjack_read_bulk_callback(struct urb *urb) | |||
391 | 391 | ||
392 | tty = tty_port_tty_get(&port->port); | 392 | tty = tty_port_tty_get(&port->port); |
393 | if (!tty) { | 393 | if (!tty) { |
394 | dbg("%s - ignoring since device not open\n", __func__); | 394 | dbg("%s - ignoring since device not open", __func__); |
395 | return; | 395 | return; |
396 | } | 396 | } |
397 | if (urb->actual_length) { | 397 | if (urb->actual_length) { |
398 | tty_buffer_request_room(tty, urb->actual_length); | ||
399 | tty_insert_flip_string(tty, data, urb->actual_length); | 398 | tty_insert_flip_string(tty, data, urb->actual_length); |
400 | tty_flip_buffer_push(tty); | 399 | tty_flip_buffer_push(tty); |
401 | } | 400 | } |