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

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

Merge tag 'usb-serial-3.17-final' of... 

Merge tag 'usb-serial-3.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial

 into usb-next

Johan writes:

USB-serial fixes for v3.17

Here are two more device IDs for v3.17.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 638139eb dee80ad1

drivers/usb/serial/cp210x.c

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */

	{ USB_DEVICE(0x10C4, 0x88A4) }, /* MMB Networks ZigBee USB Device */

	{ USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */

	{ USB_DEVICE(0x10C4, 0x8946) }, /* Ketra N1 Wireless Interface */

	{ USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */

	{ USB_DEVICE(0x10C4, 0xEA70) }, /* Silicon Labs factory default */
@@ -155,6 +156,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x1ADB, 0x0001) }, /* Schweitzer Engineering C662 Cable */

	{ USB_DEVICE(0x1B1C, 0x1C00) }, /* Corsair USB Dongle */

	{ USB_DEVICE(0x1BE3, 0x07A6) }, /* WAGO 750-923 USB Service Cable */

	{ USB_DEVICE(0x1D6F, 0x0010) }, /* Seluxit ApS RF Dongle */

	{ USB_DEVICE(0x1E29, 0x0102) }, /* Festo CPX-USB */

	{ USB_DEVICE(0x1E29, 0x0501) }, /* Festo CMSP */

	{ USB_DEVICE(0x1FB9, 0x0100) }, /* Lake Shore Model 121 Current Source */