summaryrefslogtreecommitdiffstats
path: root/usb-add-quirk-for-logitech-webcams.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-10-13 15:51:57 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-10-13 15:52:35 -0400
commit04203df13cd45f0fb154538cb9c34eb294e1d6e6 (patch)
tree761e74b85b205b18f52ffca0ce121a0cde05d5d6 /usb-add-quirk-for-logitech-webcams.patch
parent08e6eed4b2d941f6db23edbf3573c392018d7729 (diff)
downloadkernel-04203df13cd45f0fb154538cb9c34eb294e1d6e6.tar.gz
kernel-04203df13cd45f0fb154538cb9c34eb294e1d6e6.tar.xz
kernel-04203df13cd45f0fb154538cb9c34eb294e1d6e6.zip
Add C600 ID to the Logitech USB patch
Diffstat (limited to 'usb-add-quirk-for-logitech-webcams.patch')
-rw-r--r--usb-add-quirk-for-logitech-webcams.patch18
1 files changed, 11 insertions, 7 deletions
diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch
index 9a932ca57..052a27e73 100644
--- a/usb-add-quirk-for-logitech-webcams.patch
+++ b/usb-add-quirk-for-logitech-webcams.patch
@@ -1,4 +1,4 @@
-From 48ff94510ecf6b36c793c40ae3d15ce39a331e17 Mon Sep 17 00:00:00 2001
+From d5446509abd85b6845d91a319a033c5bd17e494d Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum-l3A5Bk7waGM@public.gmane.org>
Date: Tue, 13 Sep 2011 08:42:21 +0200
Subject: [PATCH] USB:add RESET_RESUME for webcams shown to be quirky
@@ -20,15 +20,16 @@ usbcore with the RESET_RESUME quirk.
Signed-off-by: Oliver Neukum <oneukum-l3A5Bk7waGM@public.gmane.org>
Add C300 ID from patch in rhbz #742010
+Add C600 ID from rhbz #742010
---
- drivers/usb/core/quirks.c | 24 ++++++++++++++++++++++++
- 1 files changed, 24 insertions(+), 0 deletions(-)
+ drivers/usb/core/quirks.c | 27 +++++++++++++++++++++++++++
+ 1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
-index 81ce6a8..d6a8d82 100644
+index 81ce6a8..caa1991 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
-@@ -38,6 +38,27 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -38,6 +38,30 @@ static const struct usb_device_id usb_quirk_list[] = {
/* Creative SB Audigy 2 NX */
{ USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME },
@@ -44,6 +45,9 @@ index 81ce6a8..d6a8d82 100644
+ /* Logitech Webcam B/C500 */
+ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
+
++ /* Logitech Webcam C600 */
++ { USB_DEVICE(0x046d, 0x0808), .driver_info = USB_QUIRK_RESET_RESUME },
++
+ /* Logitech Webcam Pro 9000 */
+ { USB_DEVICE(0x046d, 0x0809), .driver_info = USB_QUIRK_RESET_RESUME },
+
@@ -56,7 +60,7 @@ index 81ce6a8..d6a8d82 100644
/* Logitech Harmony 700-series */
{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
-@@ -69,6 +90,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+@@ -69,6 +93,9 @@ static const struct usb_device_id usb_quirk_list[] = {
{ USB_DEVICE(0x06a3, 0x0006), .driver_info =
USB_QUIRK_CONFIG_INTF_STRINGS },
@@ -67,5 +71,5 @@ index 81ce6a8..d6a8d82 100644
{ USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME },
--
-1.7.6
+1.7.6.4