Add quirk patch for logitech webcams (rhbz 729269)

This commit is contained in:
Josh Boyer 2011-08-11 14:59:19 -04:00
parent bba41d6786
commit 716ab00b8c
2 changed files with 33 additions and 0 deletions

View File

@ -691,6 +691,7 @@ Patch12021: udlfb-bind-framebuffer-to-interface.patch
Patch12022: fix-cdc-ncm-dma-stack-vars.patch
Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch
Patch12024: block-stray-block-put-after-teardown.patch
Patch12025: usb-add-quirk-for-logitech-webcams.patch
# Runtime power management
Patch12203: linux-2.6-usb-pci-autosuspend.patch
@ -1276,6 +1277,7 @@ ApplyPatch udlfb-bind-framebuffer-to-interface.patch
ApplyPatch fix-cdc-ncm-dma-stack-vars.patch
ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
ApplyPatch block-stray-block-put-after-teardown.patch
ApplyPatch usb-add-quirk-for-logitech-webcams.patch
# Runtime PM
#ApplyPatch linux-2.6-usb-pci-autosuspend.patch
@ -1909,6 +1911,7 @@ fi
%changelog
* Thu Aug 11 2011 Josh Boyer <jwboyer@redhat.com>
- Add patch davej applied to f15 for rhbz 729340
- Add munged together patch for rhbz 729269
* Tue Aug 09 2011 Josh Boyer <jwboyer@redhat.com>
- Add Makefile.config and ARM config changes from David Marlin

View File

@ -0,0 +1,30 @@
commit a218e3649310bd2ee0e8b7ec6353ab029d020289
Author: Oliver Neukum <oliver@neukum.org>
Date: Tue Aug 9 08:12:37 2011 -0400
USB: quirk for Logitech C250, C270, and C310 webcams
This need for this was shown by the new PM code
Signed-off-by: Oliver Neukum <oneukum@suse.de>
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 81ce6a8..5114281 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -41,6 +41,15 @@ static const struct usb_device_id usb_quirk_list[] = {
/* Logitech Harmony 700-series */
{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
+ /* Logitech Webcam C250 */
+ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C310 */
+ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C270 */
+ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
+
/* Philips PSC805 audio device */
{ USB_DEVICE(0x0471, 0x0155), .driver_info = USB_QUIRK_RESET_RESUME },