Am Donnerstag, den 20.06.2019, 21:19 +0100 schrieb Aidan Thornton:
> What's particularly annoying is that since this is an intermittent
> problem, it's hard to tell if I'm chasing a phantom solution for it
> again. Haven't managed to replicate it since applying this fix and did
> so pretty quickly before but you never know.
>
This is time for the sledge hammer. No more surgical solutions.
Could you test the attached patch?
Regards
Oliver
From 06b826bf3e2d3fb15aee676185c632b9f08a10db Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum@xxxxxxxx>
Date: Wed, 3 Jul 2019 15:31:05 +0200
Subject: [PATCH] Revert "usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC
webcams"
This s a partial revert of commit e387ef5c47ddeaeaa3cbdc54424cdb7a28dae2c0.
The original fix for the "squeaky voice" bug of some Logitech webcams
when used as audio devices was in
2394d67e446bf616a0885167d5f0d397bdacfdfc ("USB: add RESET_RESUME for
webcams shown to be quirky")
which in subsequent development was undone. Later tests have shown
the consolodiation to be not equivalent.
So I am taking the conservative approach, blacklisting everything that
was blacklisted at any point in the past. We have reports of multiple
devices affected and retesting this on so many old devices is
impractical.
Signed-off-by: Oliver Neukum <oneukum@xxxxxxxx>
Reported-by: Aidan Thornton <makosoft@xxxxxxxxx>
Reported-by: Marco Zatta <marco@xxxxxxxx>
---
drivers/usb/core/quirks.c | 53 ++++++++++++++++++++++++++++++++++++++---------
1 file changed, 43 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 533fe8c0f0a2..e3c24d5b2959 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -234,20 +234,53 @@ static const struct usb_device_id usb_quirk_list[] = {
/* Logitech Quickcam Fusion */
{ USB_DEVICE(0x046d, 0x08c1), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Logitech Quickcam Orbit MP */
- { USB_DEVICE(0x046d, 0x08c2), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Logitech Webcam C200 */
+ { USB_DEVICE(0x046d, 0x0802), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Logitech Quickcam Pro for Notebook */
- { USB_DEVICE(0x046d, 0x08c3), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Logitech Webcam C250 */
+ { USB_DEVICE(0x046d, 0x0804), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Logitech Quickcam Pro 5000 */
- { USB_DEVICE(0x046d, 0x08c5), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Logitech Webcam C300 */
+ { USB_DEVICE(0x046d, 0x0805), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Logitech Quickcam OEM Dell Notebook */
- { USB_DEVICE(0x046d, 0x08c6), .driver_info = USB_QUIRK_RESET_RESUME },
+ /* Logitech Webcam B/C500 */
+ { USB_DEVICE(0x046d, 0x0807), .driver_info = USB_QUIRK_RESET_RESUME },
- /* Logitech Quickcam OEM Cisco VT Camera II */
- { USB_DEVICE(0x046d, 0x08c7), .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 },
+
+ /* Logitech Webcam C905 */
+ { USB_DEVICE(0x046d, 0x080a), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C210 */
+ { USB_DEVICE(0x046d, 0x0819), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C260 */
+ { USB_DEVICE(0x046d, 0x081a), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C310 */
+ { USB_DEVICE(0x046d, 0x081b), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C910 */
+ { USB_DEVICE(0x046d, 0x0821), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C160 */
+ { USB_DEVICE(0x046d, 0x0824), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Webcam C270 */
+ { USB_DEVICE(0x046d, 0x0825), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Quickcam Pro 9000 */
+ { USB_DEVICE(0x046d, 0x0990), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Quickcam E3500 */
+ { USB_DEVICE(0x046d, 0x09a4), .driver_info = USB_QUIRK_RESET_RESUME },
+
+ /* Logitech Quickcam Vision Pro */
+ { USB_DEVICE(0x046d, 0x09a6), .driver_info = USB_QUIRK_RESET_RESUME },
/* Logitech Harmony 700-series */
{ USB_DEVICE(0x046d, 0xc122), .driver_info = USB_QUIRK_DELAY_INIT },
--
2.16.4
