projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbb50df
)
USB: add quirk for another camera
author
Oliver Neukum
<oliver@neukum.org>
Tue, 3 Jan 2012 08:58:54 +0000
(09:58 +0100)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Wed, 4 Jan 2012 00:48:56 +0000
(16:48 -0800)
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>
drivers/usb/core/quirks.c
patch
|
blob
|
history
diff --git
a/drivers/usb/core/quirks.c
b/drivers/usb/core/quirks.c
index
ecf12e1
..
4c65eb6
100644
(file)
--- 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[] = {
{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
USB_QUIRK_CONFIG_INTF_STRINGS },
- /* Guillemot Webcam Hercules Dualpix Exchange*/
+ /* Guillemot Webcam Hercules Dualpix Exchange
(2nd ID)
*/
{ USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Guillemot Webcam Hercules Dualpix Exchange*/
+ { USB_DEVICE(0x06f8, 0x3005), .driver_info = USB_QUIRK_RESET_RESUME },
+
/* M-Systems Flash Disk Pioneers */
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },