From 4b3f47e4b1ba29459df617f9a7cfdccf9670e7b5 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Mon, 7 May 2007 09:27:05 +0200 Subject: [PATCH] --- yaml --- r: 56209 b: refs/heads/master c: a91214589e6527b18f52bc0b31253f9dfb4665e6 h: refs/heads/master i: 56207: 9b65dd350b02a2c38030aee9774518ca7b8b4b00 v: v3 --- [refs] | 2 +- trunk/sound/usb/usbquirks.h | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a3044a4e0dec..daa8468b5a5c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d427c77eb2484c37d76b8e157e2b0b82c9b03062 +refs/heads/master: a91214589e6527b18f52bc0b31253f9dfb4665e6 diff --git a/trunk/sound/usb/usbquirks.h b/trunk/sound/usb/usbquirks.h index 858262068f4f..8fcbe93b2589 100644 --- a/trunk/sound/usb/usbquirks.h +++ b/trunk/sound/usb/usbquirks.h @@ -39,6 +39,29 @@ .idProduct = prod, \ .bInterfaceClass = USB_CLASS_VENDOR_SPEC +/* + * Logitech QuickCam: bDeviceClass is vendor-specific, so generic interface + * class matches do not take effect without an explicit ID match. + */ +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f0, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL +}, +{ + .match_flags = USB_DEVICE_ID_MATCH_DEVICE | + USB_DEVICE_ID_MATCH_INT_CLASS | + USB_DEVICE_ID_MATCH_INT_SUBCLASS, + .idVendor = 0x046d, + .idProduct = 0x08f6, + .bInterfaceClass = USB_CLASS_AUDIO, + .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL +}, + /* * Yamaha devices */