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

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

Merge tag 'usb-serial-3.16-rc5' of... 

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

 into usb-linus

Johan writes:

USB-serial fixes for v3.16-rc5

Here are some USB-serial updates for v3.16-rc5 that add two new device IDs.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents cd3de83f 3d28bd84

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x1843, 0x0200) }, /* Vaisala USB Instrument Cable */

	{ USB_DEVICE(0x18EF, 0xE00F) }, /* ELV USB-I2C-Interface */

	{ 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(0x1E29, 0x0102) }, /* Festo CPX-USB */

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

drivers/usb/serial/option.c

+2 −0
Original line number Diff line number Diff line
@@ -1487,6 +1487,8 @@ static const struct usb_device_id option_ids[] = { 
		.driver_info = (kernel_ulong_t)&net_intf2_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1426, 0xff, 0xff, 0xff),  /* ZTE MF91 */

		.driver_info = (kernel_ulong_t)&net_intf2_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1428, 0xff, 0xff, 0xff),  /* Telewell TW-LTE 4G v2 */

		.driver_info = (kernel_ulong_t)&net_intf2_blacklist },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1533, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1534, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1535, 0xff, 0xff, 0xff) },