diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-21 00:20:14 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-21 00:20:14 -0700 |
| commit | 468ba7b8f93d584586a0b31aaeadb890ce60068b (patch) | |
| tree | ee9b03725c2728afb173e730165a674e85792e1b /drivers/usb/class/cdc-acm.c | |
| parent | 5883338fd90e39d43f24134d58b64ea416b0e836 (diff) | |
| parent | 899e6b960577c6150d4422935990af8ffb0e78bc (diff) | |
Merge "Merge android-4.4@9f764bb (v4.4.80) into msm-4.4"
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 0b7194086c5a..df96f5f88c15 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1759,6 +1759,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */ .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ }, + { USB_DEVICE(0xfff0, 0x0100), /* DATECS FP-2000 */ + .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ + }, { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */ .driver_info = CLEAR_HALT_CONDITIONS, |