summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core/quirks.c
diff options
context:
space:
mode:
authorPhil Dibowitz <phil@ipom.com>2010-07-22 00:05:01 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 14:35:41 -0700
commit93362a875fc69881ae69299efaf19a55a1f57db0 (patch)
tree5d3163f02c4e2399ab3b59d020180563d9630f86 /drivers/usb/core/quirks.c
parent33d973ad88ceb83ed1449592b7574b5b5bb33ac6 (diff)
downloadlinux-93362a875fc69881ae69299efaf19a55a1f57db0.tar.bz2
USB delay init quirk for logitech Harmony 700-series devices
The Logitech Harmony 700 series needs an extra delay during initialization. This patch adds a USB quirk which enables such a delay and adds the device to the quirks list. Signed-off-by: Phil Dibowitz <phil@ipom.com> Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/quirks.c')
-rw-r--r--drivers/usb/core/quirks.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index db99c084df92..25719da45e33 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -38,6 +38,9 @@ static const struct usb_device_id usb_quirk_list[] = {
/* 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 },