diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-16 10:28:25 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-16 10:31:40 -0400 |
| commit | bc12142e94b6bc3c20e422e596cff4d0426c3be7 (patch) | |
| tree | 39eaaae2dd0d0cfd3eb3521abd6428e40f05645a /usb-add-quirk-for-logitech-webcams.patch | |
| parent | 8ffa0afd4c9c71c3ee7ed3b8310bada71259173a (diff) | |
| download | kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.gz kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.tar.xz kernel-bc12142e94b6bc3c20e422e596cff4d0426c3be7.zip | |
Add a few patches that were in f16 but not in rawhide
Diffstat (limited to 'usb-add-quirk-for-logitech-webcams.patch')
| -rw-r--r-- | usb-add-quirk-for-logitech-webcams.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/usb-add-quirk-for-logitech-webcams.patch b/usb-add-quirk-for-logitech-webcams.patch new file mode 100644 index 000000000..fa32f34f9 --- /dev/null +++ b/usb-add-quirk-for-logitech-webcams.patch @@ -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 }, + |