summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorHector Martin <marcan@marcan.st>2020-08-10 13:53:19 +0900
committerTakashi Iwai <tiwai@suse.de>2020-08-10 08:41:48 +0200
commit14a720dc1f5332f3bdf30a23a3bc549e81be974c (patch)
tree73a86d1057c473b9bda631369f8bdae9b6a45502 /sound
parente2d2fded6bdf3f7bb40718a208140dba8b4ec574 (diff)
downloadlinux-14a720dc1f5332f3bdf30a23a3bc549e81be974c.tar.gz
linux-14a720dc1f5332f3bdf30a23a3bc549e81be974c.tar.bz2
linux-14a720dc1f5332f3bdf30a23a3bc549e81be974c.zip
ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
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>
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 adb3b62afed4..9c3c03dc96d3 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -3662,7 +3662,13 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */
* 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",