[kernel/f15] Add quirk patch for logitech webcams (rhbz 729269)

[Josh Boyer]

commit c1dc3d8679be63d656014b2655aeb3e266d72b9c
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Thu Aug 11 15:05:26 2011 -0400

    Add quirk patch for logitech webcams (rhbz 729269)

 kernel.spec                              |    5 +++++
 usb-add-quirk-for-logitech-webcams.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 6b0e6c7..09a34c6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -648,6 +648,7 @@ Patch12016: disable-i8042-check-on-apple-mac.patch
 
 Patch12022: fix-cdc-ncm-dma-stack-vars.patch
 Patch12023: ums-realtek-driver-uses-stack-memory-for-DMA.patch
+Patch12024: usb-add-quirk-for-logitech-webcams.patch
 
 # Runtime power management
 Patch12203: linux-2.6-usb-pci-autosuspend.patch
@@ -1205,6 +1206,7 @@ ApplyPatch add-appleir-usb-driver.patch
 
 ApplyPatch fix-cdc-ncm-dma-stack-vars.patch
 ApplyPatch ums-realtek-driver-uses-stack-memory-for-DMA.patch
+ApplyPatch usb-add-quirk-for-logitech-webcams.patch
 
 # rhbz#605888
 ApplyPatch dmar-disable-when-ricoh-multifunction.patch
@@ -1829,6 +1831,9 @@ fi
 # and build.
 
 %changelog
+* Thu Aug 11 2011 Josh Boyer <jwboyer at redhat.com>
+- Add munged together patch for rhbz 729269
+
 * Thu Aug 11 2011 Dave Jones <davej at redhat.com>
 - Fix Xen blk device naming (rhbz 729340)
 
diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch
new file mode 100644
index 0000000..fa32f34
--- /dev/null
+++ b/usb-add-quirk-for-logitech-webcams.patch
@@ -0,0 +1,30 @@
+commit a218e3649310bd2ee0e8b7ec6353ab029d020289
+Author: Oliver Neukum <oliver at 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 at 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 },
+