diff options
author | Oliver Neukum <oliver@neukum.org> | 2012-01-03 03:58:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-03 19:48:56 -0500 |
commit | 35284b3d2f68a8a3703745e629999469f78386b5 (patch) | |
tree | da5ece88dac3d1a9f97ef849a979e709ff70d2c9 /drivers/usb/core/quirks.c | |
parent | cbb50df6540b4d36d35d09ce78076dad0be6bf6e (diff) |
USB: add quirk for another camera
The Guillemot Webcam Hercules Dualpix Exchange camera
has been reported with a second ID.
Signed-off-by: Oliver Neukum <oneukum@suse.de>
Cc: stable <stable@vger.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.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index ecf12e15a7ef..4c65eb6a867a 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c | |||
@@ -117,9 +117,12 @@ static const struct usb_device_id usb_quirk_list[] = { | |||
117 | { USB_DEVICE(0x06a3, 0x0006), .driver_info = | 117 | { USB_DEVICE(0x06a3, 0x0006), .driver_info = |
118 | USB_QUIRK_CONFIG_INTF_STRINGS }, | 118 | USB_QUIRK_CONFIG_INTF_STRINGS }, |
119 | 119 | ||
120 | /* Guillemot Webcam Hercules Dualpix Exchange*/ | 120 | /* Guillemot Webcam Hercules Dualpix Exchange (2nd ID) */ |
121 | { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, | 121 | { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, |
122 | 122 | ||
123 | /* Guillemot Webcam Hercules Dualpix Exchange*/ | ||
124 | { USB_DEVICE(0x06f8, 0x3005), .driver_info = USB_QUIRK_RESET_RESUME }, | ||
125 | |||
123 | /* M-Systems Flash Disk Pioneers */ | 126 | /* M-Systems Flash Disk Pioneers */ |
124 | { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, | 127 | { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, |
125 | 128 | ||