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

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

Merge tag 'usb-serial-4.1-rc4' of... 

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

 into usb-linus

Johan writes:

USB-serial fixes for v4.1-rc4

Here are a few device-id changes removing a duplicate entry, refining
another and adding a third.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 17211509 82ee3aeb

drivers/usb/serial/cp210x.c

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(0x10C4, 0x88A5) }, /* Planet Innovation Ingeni ZigBee USB Device */

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

	{ USB_DEVICE(0x10C4, 0x8977) },	/* CEL MeshWorks DevKit Device */

	{ USB_DEVICE(0x10C4, 0x8998) }, /* KCF Technologies PRN */

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

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

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

drivers/usb/serial/pl2303.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static const struct usb_device_id id_table[] = { 
	{ USB_DEVICE(DCU10_VENDOR_ID, DCU10_PRODUCT_ID) },

	{ USB_DEVICE(SITECOM_VENDOR_ID, SITECOM_PRODUCT_ID) },

	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_ID) },

	{ USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_PRODUCT_ID) },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_SX1),

		.driver_info = PL2303_QUIRK_UART_STATE_IDX0 },

	{ USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65),

drivers/usb/serial/pl2303.h

+0 −4
Original line number Diff line number Diff line
@@ -62,10 +62,6 @@ 
#define ALCATEL_VENDOR_ID	0x11f7

#define ALCATEL_PRODUCT_ID	0x02df



/* Samsung I330 phone cradle */

#define SAMSUNG_VENDOR_ID	0x04e8

#define SAMSUNG_PRODUCT_ID	0x8001



#define SIEMENS_VENDOR_ID	0x11f5

#define SIEMENS_PRODUCT_ID_SX1	0x0001

#define SIEMENS_PRODUCT_ID_X65	0x0003

drivers/usb/serial/visor.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static const struct usb_device_id id_table[] = { 
		.driver_info = (kernel_ulong_t)&palm_os_4_probe },

	{ USB_DEVICE(ACER_VENDOR_ID, ACER_S10_ID),

		.driver_info = (kernel_ulong_t)&palm_os_4_probe },

	{ USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID),

	{ USB_DEVICE_INTERFACE_CLASS(SAMSUNG_VENDOR_ID, SAMSUNG_SCH_I330_ID, 0xff),

		.driver_info = (kernel_ulong_t)&palm_os_4_probe },

	{ USB_DEVICE(SAMSUNG_VENDOR_ID, SAMSUNG_SPH_I500_ID),

		.driver_info = (kernel_ulong_t)&palm_os_4_probe },