Commit 14b51ccd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Correct wrongly matching entries with audio class 



The commit 51ab5d77 ("ALSA: usb-audio: Properly match with audio
interface class") converted the quirk entries that have both vid/pid
pair and bInterface fields to match with all those with a new macro
USB_AUDIO_CLASS().  However, it turned out that those are false
conversions; all those (but the unknown KeithMcMillen device) are
actually with vendor-specific interface class, hence the conversions
broke the matching.

This patch corrects those entries to the right one,
USB_DEVICE_VENDOR_SPEC() (and USB_DEVICE() for KeithMcMillen to be
sure), and drop the unused USB_AUDIO_CLASS macro again.

Fixes: 51ab5d77 ("ALSA: usb-audio: Properly match with audio interface class")
Reported-by: default avatarAlexander Tsoy <alexander@tsoy.me>
Link: https://lore.kernel.org/r/20200823113251.10175-1-tiwai@suse.de


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ee15d9b8

sound/usb/quirks-table.h

+6 −15
Original line number Diff line number Diff line
@@ -35,14 +35,6 @@ 
	.bInterfaceClass = USB_CLASS_AUDIO, \

	.bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL



/* Another standard entry matching with vid/pid and the audio class */

#define USB_AUDIO_CLASS(vend, prod) \

	.match_flags = USB_DEVICE_ID_MATCH_DEVICE | \

		       USB_DEVICE_ID_MATCH_INT_CLASS, \

	.idVendor = vend, \

	.idProduct = prod, \

	.bInterfaceClass = USB_CLASS_AUDIO



/* FTDI devices */

{

	USB_DEVICE(0x0403, 0xb8d8),
@@ -77,13 +69,13 @@ 
},



/* E-Mu 0202 USB */

{ USB_AUDIO_CLASS(0x041e, 0x3f02) },

{ USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f02) },

/* E-Mu 0404 USB */

{ USB_AUDIO_CLASS(0x041e, 0x3f04) },

{ USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f04) },

/* E-Mu Tracker Pre */

{ USB_AUDIO_CLASS(0x041e, 0x3f0a) },

{ USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f0a) },

/* E-Mu 0204 USB */

{ USB_AUDIO_CLASS(0x041e, 0x3f19) },

{ USB_DEVICE_VENDOR_SPEC(0x041e, 0x3f19) },



/*

 * HP Wireless Audio
@@ -2756,7 +2748,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
},



/* KeithMcMillen Stringport */

{ USB_AUDIO_CLASS(0x1f38, 0x0001) },

{ USB_DEVICE(0x1f38, 0x0001) }, /* FIXME: should be more restrictive matching */



/* Miditech devices */

{
@@ -2979,7 +2971,7 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), 
},

{

	/* Tascam US122 MKII - playback-only support */

	USB_AUDIO_CLASS(0x0644, 0x8021),

	USB_DEVICE_VENDOR_SPEC(0x0644, 0x8021),

	.driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {

		.vendor_name = "TASCAM",

		.product_name = "US122 MKII",
@@ -3611,4 +3603,3 @@ AU0828_DEVICE(0x2040, 0x7270, "Hauppauge", "HVR-950Q"), 


#undef USB_DEVICE_VENDOR_SPEC

#undef USB_AUDIO_DEVICE
 
#undef USB_AUDIO_CLASS

CRA Git | Maintained and supported by SUSTech CRA and CCSE