Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7d6a32f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'usb-serial-4.14-rc6' of... 

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: default avatarJohan Hovold <johan@kernel.org>
parents 1c0edc36 31dc3f81

drivers/usb/serial/metro-usb.c

+1 −0
Original line number Diff line number Diff line
@@ -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);