tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Johan Hovold <johan@kernel.org>

Greg Kroah-Hartman 8b0da75c 30966910

+14 -2
+1
drivers/usb/serial/ftdi_sio.c
··· 728 728 { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID), 729 729 .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk }, 730 730 { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) }, 731 + { USB_DEVICE(NOVITUS_VID, NOVITUS_BONO_E_PID) }, 731 732 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S03_PID) }, 732 733 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_59_PID) }, 733 734 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_57A_PID) },
+6
drivers/usb/serial/ftdi_sio_ids.h
··· 837 837 #define TELLDUS_TELLSTICK_PID 0x0C30 /* RF control dongle 433 MHz using FT232RL */ 838 838 839 839 /* 840 + * NOVITUS printers 841 + */ 842 + #define NOVITUS_VID 0x1a28 843 + #define NOVITUS_BONO_E_PID 0x6010 844 + 845 + /* 840 846 * RT Systems programming cables for various ham radios 841 847 */ 842 848 #define RTSYSTEMS_VID 0x2100 /* Vendor ID */
+7 -2
drivers/usb/serial/sierra.c
··· 282 282 /* Sierra Wireless HSPA Non-Composite Device */ 283 283 { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)}, 284 284 { USB_DEVICE(0x1199, 0x6893) }, /* Sierra Wireless Device */ 285 - { USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless Direct IP modems */ 285 + /* Sierra Wireless Direct IP modems */ 286 + { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68A3, 0xFF, 0xFF, 0xFF), 287 + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist 288 + }, 289 + { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68AA, 0xFF, 0xFF, 0xFF), 286 290 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist 287 291 }, 288 292 /* AT&T Direct IP LTE modems */ 289 293 { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF), 290 294 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist 291 295 }, 292 - { USB_DEVICE(0x0f3d, 0x68A3), /* Airprime/Sierra Wireless Direct IP modems */ 296 + /* Airprime/Sierra Wireless Direct IP modems */ 297 + { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68A3, 0xFF, 0xFF, 0xFF), 293 298 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist 294 299 }, 295 300