diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-19 09:31:18 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-19 09:31:18 +0200 |
| commit | e7d6a32f0d1505695d4417caf93e4a64c06ffe9f (patch) | |
| tree | 21d6aec8a7cc2cf59a1a3863ed1019815870b4ff /drivers/usb | |
| parent | USB: core: fix out-of-bounds access bug in usb_get_bos_descriptor() (diff) | |
| parent | USB: serial: metro-usb: add MS7820 device id (diff) | |
| download | linux-dev-e7d6a32f0d1505695d4417caf93e4a64c06ffe9f.tar.xz linux-dev-e7d6a32f0d1505695d4417caf93e4a64c06ffe9f.zip | |
Merge tag 'usb-serial-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.14-rc6
Here's a new metro-usb device id for another bar-code scanner.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/metro-usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/metro-usb.c b/drivers/usb/serial/metro-usb.c index cc84da8dbb84..14511d6a7d44 100644 --- a/drivers/usb/serial/metro-usb.c +++ b/drivers/usb/serial/metro-usb.c @@ -45,6 +45,7 @@ struct metrousb_private { static const struct usb_device_id id_table[] = { { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_BI) }, { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_UNI) }, + { USB_DEVICE_INTERFACE_CLASS(0x0c2e, 0x0730, 0xff) }, /* MS7820 */ { }, /* Terminating entry. */ }; MODULE_DEVICE_TABLE(usb, id_table); |