diff options
Diffstat (limited to 'drivers/usb/serial/ir-usb.c')
-rw-r--r-- | drivers/usb/serial/ir-usb.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/usb/serial/ir-usb.c b/drivers/usb/serial/ir-usb.c index 95d8d26b9a44..4a0f51974232 100644 --- a/drivers/usb/serial/ir-usb.c +++ b/drivers/usb/serial/ir-usb.c | |||
@@ -100,7 +100,7 @@ static u8 ir_baud; | |||
100 | static u8 ir_xbof; | 100 | static u8 ir_xbof; |
101 | static u8 ir_add_bof; | 101 | static u8 ir_add_bof; |
102 | 102 | ||
103 | static struct usb_device_id ir_id_table[] = { | 103 | static const struct usb_device_id ir_id_table[] = { |
104 | { USB_DEVICE(0x050f, 0x0180) }, /* KC Technology, KC-180 */ | 104 | { USB_DEVICE(0x050f, 0x0180) }, /* KC Technology, KC-180 */ |
105 | { USB_DEVICE(0x08e9, 0x0100) }, /* XTNDAccess */ | 105 | { USB_DEVICE(0x08e9, 0x0100) }, /* XTNDAccess */ |
106 | { USB_DEVICE(0x09c4, 0x0011) }, /* ACTiSys ACT-IR2000U */ | 106 | { USB_DEVICE(0x09c4, 0x0011) }, /* ACTiSys ACT-IR2000U */ |
@@ -445,11 +445,6 @@ static void ir_read_bulk_callback(struct urb *urb) | |||
445 | 445 | ||
446 | dbg("%s - port %d", __func__, port->number); | 446 | dbg("%s - port %d", __func__, port->number); |
447 | 447 | ||
448 | if (!port->port.count) { | ||
449 | dbg("%s - port closed.", __func__); | ||
450 | return; | ||
451 | } | ||
452 | |||
453 | switch (status) { | 448 | switch (status) { |
454 | case 0: /* Successful */ | 449 | case 0: /* Successful */ |
455 | /* | 450 | /* |
@@ -462,10 +457,8 @@ static void ir_read_bulk_callback(struct urb *urb) | |||
462 | usb_serial_debug_data(debug, &port->dev, __func__, | 457 | usb_serial_debug_data(debug, &port->dev, __func__, |
463 | urb->actual_length, data); | 458 | urb->actual_length, data); |
464 | tty = tty_port_tty_get(&port->port); | 459 | tty = tty_port_tty_get(&port->port); |
465 | if (tty_buffer_request_room(tty, urb->actual_length - 1)) { | 460 | tty_insert_flip_string(tty, data+1, urb->actual_length - 1); |
466 | tty_insert_flip_string(tty, data+1, urb->actual_length - 1); | 461 | tty_flip_buffer_push(tty); |
467 | tty_flip_buffer_push(tty); | ||
468 | } | ||
469 | tty_kref_put(tty); | 462 | tty_kref_put(tty); |
470 | 463 | ||
471 | /* | 464 | /* |