Commit 14a720dc authored Aug 10, 2020 by Hector Martin Committed by Takashi Iwai Aug 10, 2020

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: e337bf19 ("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>

parent e2d2fded

sound/usb/quirks-table.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -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",

Admin message