projects
/
platform
/
kernel
/
linux-amlogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b25302e
)
ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
author
Hector Martin
<marcan@marcan.st>
Mon, 10 Aug 2020 04:53:19 +0000
(13:53 +0900)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 09:02:05 +0000
(11:02 +0200)
commit
14a720dc1f5332f3bdf30a23a3bc549e81be974c
upstream.
Matching by device matches all interfaces, which breaks the video/HID
portions of the device depending on module load order.
Fixes:
e337bf19f6af
("ALSA: usb-audio: add quirk for MacroSilicon MS2109")
Cc: stable@vger.kernel.org
Signed-off-by: Hector Martin <marcan@marcan.st>
Link:
https://lore.kernel.org/r/20200810045319.128745-1-marcan@marcan.st
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/usb/quirks-table.h
patch
|
blob
|
history
diff --git
a/sound/usb/quirks-table.h
b/sound/usb/quirks-table.h
index
ec56ce3
..
69df786
100644
(file)
--- a/
sound/usb/quirks-table.h
+++ b/
sound/usb/quirks-table.h
@@
-3335,7
+3335,13
@@
AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"),
* with.
*/
{
- USB_DEVICE(0x534d, 0x2109),
+ .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
+ USB_DEVICE_ID_MATCH_INT_CLASS |
+ USB_DEVICE_ID_MATCH_INT_SUBCLASS,
+ .idVendor = 0x534d,
+ .idProduct = 0x2109,
+ .bInterfaceClass = USB_CLASS_AUDIO,
+ .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
.vendor_name = "MacroSilicon",
.product_name = "MS2109",