Merge tag 'usb-serial-4.14-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Greg Kroah-Hartman 8 years ago e7d6a32f 1c0edc36

1 changed file

expand all

drivers

usb

serial

metro-usb.c

drivers/usb/serial/metro-usb.c

··· 45 45 static const struct usb_device_id id_table[] = { 46 46 { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_BI) }, 47 47 { USB_DEVICE(FOCUS_VENDOR_ID, FOCUS_PRODUCT_ID_UNI) }, 48 + { USB_DEVICE_INTERFACE_CLASS(0x0c2e, 0x0730, 0xff) }, /* MS7820 */ 48 49 { }, /* Terminating entry. */ 49 50 }; 50 51 MODULE_DEVICE_TABLE(usb, id_table);