summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Szmigiero <mhej@o2.pl>2011-02-05 21:52:00 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-02 09:47:02 -0500
commit84a282de663af75467400b4161ba0e08ed190170 (patch)
tree1d6a82226f99e1aaad6ccbd054b5d05dbbf83337
parent9bdebf825c5ea3b36b3ba44f9248db9479db86d3 (diff)
downloadlwn-84a282de663af75467400b4161ba0e08ed190170.tar.gz
lwn-84a282de663af75467400b4161ba0e08ed190170.zip
USB: Add quirk for Samsung Android phone modem
commit 72a012ce0a02c6c616676a24b40ff81d1aaeafda upstream. My Galaxy Spica needs this quirk when in modem mode, otherwise it causes endless USB bus resets and is unusable in this mode. Unfortunately Samsung decided to reuse ID of its old CDMA phone SGH-I500 for the modem part. That's why in addition to this patch the visor driver must be prevented from binding to SPH-I500 ID, so ACM driver can do that. Signed-off-by: Maciej Szmigiero <mhej@o2.pl> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/core/quirks.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 22eff0fb2a31..62e1cfdcdad8 100644
--- a/drivers/usb/core/quirks.c
+++ b/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 },