diff options
| author | Greg Kroah-Hartman | 2017-07-24 04:55:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-07-24 04:55:51 +0200 |
| commit | 141769851cb73e8f986e9ed83129cde3b645288d (patch) | |
| tree | 53bc1d8115e160df0ba1e315ca0ee7c858a01a53 /drivers/usb/class | |
| parent | usb: core: hub: controller driver name may be NULL (diff) | |
| parent | Linux 4.13-rc2 (diff) | |
| download | kernel-qcow2-linux-141769851cb73e8f986e9ed83129cde3b645288d.tar.gz kernel-qcow2-linux-141769851cb73e8f986e9ed83129cde3b645288d.tar.xz kernel-qcow2-linux-141769851cb73e8f986e9ed83129cde3b645288d.zip | |
Merge 4.13-rc2 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class')
| -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 5357d83bbda2..5e056064259c 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1829,6 +1829,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, |