Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d2c4954 authored by Hector Martin's avatar Hector Martin Committed by Greg Kroah-Hartman
Browse files

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: default avatarHector Martin <marcan@marcan.st>
Link: https://lore.kernel.org/r/20200810045319.128745-1-marcan@marcan.st


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5f647e3

sound/usb/quirks-table.h

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