diff options
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | usb-add-quirk-for-logitech-webcams.patch | 69 |
2 files changed, 59 insertions, 15 deletions
diff --git a/kernel.spec b/kernel.spec index 5c891f1e8..0982cb087 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 0 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -2051,6 +2051,9 @@ fi # ||----w | # || || %changelog +* Thu Sep 29 2011 Josh Boyer <jwboyer@redhat.com> +- Update logitech USB quirk patch + * Tue Sep 27 2011 Chuck Ebbert <cebbert@redhat.com> - Linux 3.1-rc8 - New option: CONFIG_ARM_ERRATA_764369 is not set diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch index fa32f34f9..9a932ca57 100644 --- a/usb-add-quirk-for-logitech-webcams.patch +++ b/usb-add-quirk-for-logitech-webcams.patch @@ -1,30 +1,71 @@ -commit a218e3649310bd2ee0e8b7ec6353ab029d020289 -Author: Oliver Neukum <oliver@neukum.org> -Date: Tue Aug 9 08:12:37 2011 -0400 +From 48ff94510ecf6b36c793c40ae3d15ce39a331e17 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 - 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> +From 6f673c5ef819548b2cbaf7bb607779af6fdbe731 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum <oliver-GvhC2dPhHPQdnm+yROfE0A@public.gmane.org> +Date: Tue, 30 Aug 2011 15:34:32 +0200 +Subject: [PATCH] USB:add RESET_RESUME for webcams shown to be quirky + +The new runtime PM code has shown that many webcams suffer +from a race condition that may crash them upon resume. +Runtime PM is especially prone to show the problem because +it retains power to the cameras at all times. However +system suspension may also crash the devices and retain +power to the devices. +The only way to solve this problem without races is in +usbcore with the RESET_RESUME quirk. + +Signed-off-by: Oliver Neukum <oneukum-l3A5Bk7waGM@public.gmane.org> + +Add C300 ID from patch in rhbz #742010 +--- + drivers/usb/core/quirks.c | 24 ++++++++++++++++++++++++ + 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 81ce6a8..5114281 100644 +index 81ce6a8..d6a8d82 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 }, +@@ -38,6 +38,27 @@ static const struct usb_device_id usb_quirk_list[] = { + /* Creative SB Audigy 2 NX */ + { USB_DEVICE(0x041e, 0x3020), .driver_info = USB_QUIRK_RESET_RESUME }, ++ /* Logitech Webcam C200 */ ++ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* Logitech Webcam C250 */ + { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, + ++ /* Logitech Webcam C300 */ ++ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam B/C500 */ ++ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME }, ++ ++ /* Logitech Webcam Pro 9000 */ ++ { USB_DEVICE(0x046d, 0x0809), .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 }, + /* 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[] = { + { USB_DEVICE(0x06a3, 0x0006), .driver_info = + USB_QUIRK_CONFIG_INTF_STRINGS }, ++ /* Guillemot Webcam Hercules Dualpix Exchange*/ ++ { USB_DEVICE(0x06f8, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME }, ++ + /* M-Systems Flash Disk Pioneers */ + { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, + +-- +1.7.6 + |