History

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.

Greg Kroah-Hartman committed 12 years ago

Commit 8b0da752 parents 3096691 5b3da693 files · +14 −2Browse files

Unified · Split

3 files
  1. drivers/usb/serial/ftdi_sio.c +1 −0
  2. drivers/usb/serial/ftdi_sio_ids.h +6 −0
  3. drivers/usb/serial/sierra.c +7 −2
drivers/usb/serial/ftdi_sio.c+1−0
@@ -728,6 +728,7 @@ static const struct usb_device_id id_table_combined[] = { · 727 unmodified lines
728 { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID),728 { USB_DEVICE(FTDI_VID, FTDI_NDI_AURORA_SCU_PID),
729 .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk },729 .driver_info = (kernel_ulong_t)&ftdi_NDI_device_quirk },
730 { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },730 { USB_DEVICE(TELLDUS_VID, TELLDUS_TELLSTICK_PID) },
731 { USB_DEVICE(NOVITUS_VID, NOVITUS_BONO_E_PID) },
731 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S03_PID) },732 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_S03_PID) },
732 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_59_PID) },733 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_59_PID) },
733 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_57A_PID) },734 { USB_DEVICE(RTSYSTEMS_VID, RTSYSTEMS_USB_57A_PID) },
drivers/usb/serial/ftdi_sio_ids.h+6−0
@@ -836,6 +836,12 @@ · 835 unmodified lines
836#define TELLDUS_VID 0x1781 /* Vendor ID */836#define TELLDUS_VID 0x1781 /* Vendor ID */
837#define TELLDUS_TELLSTICK_PID 0x0C30 /* RF control dongle 433 MHz using FT232RL */837#define TELLDUS_TELLSTICK_PID 0x0C30 /* RF control dongle 433 MHz using FT232RL */
838 838
839/*
840 * NOVITUS printers
841 */
842#define NOVITUS_VID 0x1a28
843#define NOVITUS_BONO_E_PID 0x6010
844
839/*845/*
840 * RT Systems programming cables for various ham radios846 * RT Systems programming cables for various ham radios
841 */847 */
drivers/usb/serial/sierra.c+7−2
@@ -282,14 +282,19 @@ static const struct usb_device_id id_table[] = { · 281 unmodified lines
282 /* Sierra Wireless HSPA Non-Composite Device */282 /* Sierra Wireless HSPA Non-Composite Device */
283 { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},283 { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
284 { USB_DEVICE(0x1199, 0x6893) }, /* Sierra Wireless Device */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 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist290 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
287 },291 },
288 /* AT&T Direct IP LTE modems */292 /* AT&T Direct IP LTE modems */
289 { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF),293 { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF),
290 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist294 .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 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist298 .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
294 },299 },
295 300

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t