From 277e53d2cfb681a2f9be6611aedefb80b05b89e7 Mon Sep 17 00:00:00 2001 From: Fedor Date: Wed, 23 Feb 2011 01:23:03 -0500 Subject: [PATCH] USB: new quirks/IDs from upstream kernel.org commits 3c18e30f87ac5466bddbb05cf955605efd7db025 72a012ce0a02c6c616676a24b40ff81d1aaeafda e1dc5157c574e7249dc1cd072fde2e48b3011533 --- release/src-rt/linux/linux-2.6/drivers/usb/core/quirks.c | 8 ++++++++ release/src-rt/linux/linux-2.6/drivers/usb/serial/sierra.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/release/src-rt/linux/linux-2.6/drivers/usb/core/quirks.c b/release/src-rt/linux/linux-2.6/drivers/usb/core/quirks.c index 70c0193602..92666ae327 100644 --- a/release/src-rt/linux/linux-2.6/drivers/usb/core/quirks.c +++ b/release/src-rt/linux/linux-2.6/drivers/usb/core/quirks.c @@ -48,6 +48,10 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x04b4, 0x0526), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Samsung Android phone modem - ID conflict with SPH-I500 */ + { USB_DEVICE(0x04e8, 0x6601), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + /* Roland SC-8820 */ { USB_DEVICE(0x0582, 0x0007), .driver_info = USB_QUIRK_RESET_RESUME }, @@ -65,6 +69,10 @@ static const struct usb_device_id usb_quirk_list[] = { /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Keytouch QWERTY Panel keyboard */ + { USB_DEVICE(0x0926, 0x3333), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, + /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */ { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF }, diff --git a/release/src-rt/linux/linux-2.6/drivers/usb/serial/sierra.c b/release/src-rt/linux/linux-2.6/drivers/usb/serial/sierra.c index 753f31e5d1..29bb874c7f 100755 --- a/release/src-rt/linux/linux-2.6/drivers/usb/serial/sierra.c +++ b/release/src-rt/linux/linux-2.6/drivers/usb/serial/sierra.c @@ -299,6 +299,9 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless Direct IP modems */ .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist }, + { USB_DEVICE(0x0f3d, 0x68A3), /* Airprime/Sierra Wireless Direct IP modems */ + .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist + }, { USB_DEVICE(0x413C, 0x08133) }, /* Dell Computer Corp. Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port */ { } -- 2.11.4.GIT