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

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

@@ -38,9 +38,20 @@ static const struct usb_device_id usb_qu

/* Creative SB Audigy 2 NX */

{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },

+ /* Logitech Harmony 700-series */

+ { USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },

+

/* Philips PSC805 audio device */

{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },

+ /* Artisman Watchdog Dongle */

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

@@ -61,9 +72,16 @@ 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 },

+ /* Broadcom BCM92035DGROM BT dongle */

+ { USB_DEVICE(0x0a5c, 0x2021), .driver_info = USB_QUIRK_RESET_RESUME },

+

/* Action Semiconductor flash disk */

{ USB_DEVICE(0x10d6, 0x2200), .driver_info =

USB_QUIRK_STRING_FETCH_255 },