aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorChirayu Desai <cdesai@cyanogenmod.org>2013-06-16 09:53:33 +0530
committerChirayu Desai <cdesai@cyanogenmod.org>2013-06-16 09:53:33 +0530
commitd744f55acdc539cd5b802bb10600ec0dcac46ea4 (patch)
tree161ba6f31fd6deef545dbc03c0da5a6e02218cf3 /sound
parent0ea6eab87c85317af3fc549950715b9e42795706 (diff)
parentae02c5a7cd1ed15da0976a44b8d0da4ad5c0975d (diff)
downloadkernel_samsung_aries-d744f55acdc539cd5b802bb10600ec0dcac46ea4.zip
kernel_samsung_aries-d744f55acdc539cd5b802bb10600ec0dcac46ea4.tar.gz
kernel_samsung_aries-d744f55acdc539cd5b802bb10600ec0dcac46ea4.tar.bz2
Merge tag 'v3.0.82' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into HEAD
This is the 3.0.82 stable release
Diffstat (limited to 'sound')
-rw-r--r--sound/usb/quirks-table.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 11a9f86..3c30b3b 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -146,7 +146,13 @@
.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL
},
{
- USB_DEVICE(0x046d, 0x0990),
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
+ USB_DEVICE_ID_MATCH_INT_CLASS |
+ USB_DEVICE_ID_MATCH_INT_SUBCLASS,
+ .idVendor = 0x046d,
+ .idProduct = 0x0990,
+ .bInterfaceClass = USB_CLASS_AUDIO,
+ .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
.driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) {
.vendor_name = "Logitech, Inc.",
.product_name = "QuickCam Pro 9000",