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

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

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

 into usb-linus

Johan writes:

USB-serial fixes for v3.17-rc4

These updates add back some PIDs that were lost in a recent revert and add a
couple of new ones. Included is also an update to how the sierra driver binds
its interfaces in order to avoid binding CDC interfaces.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parents 30966910 5b3da692

drivers/usb/serial/ftdi_sio.c

+1 −0
Original line number Diff line number Diff line
@@ -728,6 +728,7 @@ static const struct usb_device_id id_table_combined[] = { 
	{ USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID),

		.driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk },

	{ USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },

	{ USB_DEVICE(NOVITUS_VID, NOVITUS_BONO_E_PID) },

	{ USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S03_PID) },

	{ USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_59_PID) },

	{ USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_57A_PID) },

drivers/usb/serial/ftdi_sio_ids.h

+6 −0
Original line number Diff line number Diff line
@@ -836,6 +836,12 @@ 
#define TELLDUS_VID			0x1781	/* Vendor ID */

#define TELLDUS_TELLSTICK_PID		0x0C30	/* RF control dongle 433 MHz using FT232RL */



/*

 * NOVITUS printers

 */

#define NOVITUS_VID			0x1a28

#define NOVITUS_BONO_E_PID		0x6010



/*

 * RT Systems programming cables for various ham radios

 */

drivers/usb/serial/sierra.c

+7 −2
Original line number Diff line number Diff line
@@ -282,14 +282,19 @@ static const struct usb_device_id id_table[] = { 
	/* Sierra Wireless HSPA Non-Composite Device */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},

	{ USB_DEVICE(0x1199, 0x6893) },	/* Sierra Wireless Device */

	{ USB_DEVICE(0x1199, 0x68A3), 	/* Sierra Wireless Direct IP modems */

	/* Sierra Wireless Direct IP modems */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68A3, 0xFF, 0xFF, 0xFF),

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist

	},

	{ USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68AA, 0xFF, 0xFF, 0xFF),

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist

	},

	/* AT&T Direct IP LTE modems */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF),

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist

	},

	{ USB_DEVICE(0x0f3d, 0x68A3), 	/* Airprime/Sierra Wireless Direct IP modems */

	/* Airprime/Sierra Wireless Direct IP modems */

	{ USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68A3, 0xFF, 0xFF, 0xFF),

	  .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist

	},

CRA Git | Maintained and supported by SUSTech CRA and CCSE