Skip to content

Commit 14a720d

Browse files
marcantiwai
authored andcommitted
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: e337bf1 ("ALSA: usb-audio: add quirk for MacroSilicon MS2109") Cc: [email protected] Signed-off-by: Hector Martin <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent e2d2fde commit 14a720d

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

sound/usb/quirks-table.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3662,7 +3662,13 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */
36623662
* with.
36633663
*/
36643664
{
3665-
USB_DEVICE(0x534d, 0x2109),
3665+
.match_flags = USB_DEVICE_ID_MATCH_DEVICE |
3666+
USB_DEVICE_ID_MATCH_INT_CLASS |
3667+
USB_DEVICE_ID_MATCH_INT_SUBCLASS,
3668+
.idVendor = 0x534d,
3669+
.idProduct = 0x2109,
3670+
.bInterfaceClass = USB_CLASS_AUDIO,
3671+
.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL,
36663672
.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
36673673
.vendor_name = "MacroSilicon",
36683674
.product_name = "MS2109",

0 commit comments

Comments
 (0)