aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHector Martin <marcan@marcan.st>2020-08-10 13:53:19 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-19 08:16:24 +0200
commit1d2c4954e82b18aeea8d8568b6e7dccdc54338b9 (patch)
tree9106c08b8414d5f958b70fc8856288021f21976f
parentd5f647e3a72a3ace84cc892eb8e19990f22390a4 (diff)
downloadlinux-yocto-1d2c4954e82b18aeea8d8568b6e7dccdc54338b9.tar.gz
linux-yocto-1d2c4954e82b18aeea8d8568b6e7dccdc54338b9.tar.bz2
linux-yocto-1d2c4954e82b18aeea8d8568b6e7dccdc54338b9.zip
ALSA: usb-audio: fix overeager device match for MacroSilicon MS2109
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>
-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 562179492a33..77612ed7487b 100644
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -3623,7 +3623,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",