--- drivers/usb/core/quirks.c

+++ drivers/usb/core/quirks.c

@@ -48,6 +48,10 @@ static const struct usb_device_id usb_qu

{ 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 },

@@ -68,6 +72,10 @@ static const struct usb_device_id usb_qu

/* 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 },