Commit d7631453 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: usb-audio: Skip probe of UA-101 devices 

UA-101 device and co are supported by another driver, snd-ua101, but
the USB audio class driver (snd-usb-audio) catches all and this
resulted in the lack of functionality like missing MIDI devices.

This patch introduces a sort of deny-listing for those devices to just
return -ENODEV at probe in snd-usb-audio driver, so that it falls back
to the probe by snd-ua101.

BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=212477
Link: https://lore.kernel.org/r/20210408075656.30184-1-tiwai@suse.de


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

sound/usb/card.c

+2 −0
Original line number Diff line number Diff line
@@ -713,6 +713,8 @@ static int usb_audio_probe(struct usb_interface *intf, 
		quirk = get_alias_quirk(dev, id);

	if (quirk && quirk->ifnum >= 0 && ifnum != quirk->ifnum)

		return -ENXIO;

	if (quirk && quirk->ifnum == QUIRK_NODEV_INTERFACE)

		return -ENODEV;



	err = snd_usb_apply_boot_quirk(dev, intf, quirk, id);

	if (err < 0)

sound/usb/quirks-table.h

+21 −0
Original line number Diff line number Diff line
@@ -1674,6 +1674,27 @@ YAMAHA_DEVICE(0x7010, "UB99"), 
		}

	}

},



/* UA101 and co are supported by another driver */

{

	USB_DEVICE(0x0582, 0x0044), /* UA-1000 high speed */

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

		.ifnum = QUIRK_NODEV_INTERFACE

	},

},

{

	USB_DEVICE(0x0582, 0x007d), /* UA-101 high speed */

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

		.ifnum = QUIRK_NODEV_INTERFACE

	},

},

{

	USB_DEVICE(0x0582, 0x008d), /* UA-101 full speed */

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

		.ifnum = QUIRK_NODEV_INTERFACE

	},

},



/* this catches most recent vendor-specific Roland devices */

{

	.match_flags = USB_DEVICE_ID_MATCH_VENDOR |

sound/usb/usbaudio.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct snd_usb_audio { 
 */



/* special values for .ifnum */

#define QUIRK_NODEV_INTERFACE		-3	/* return -ENODEV */

#define QUIRK_NO_INTERFACE		-2

#define QUIRK_ANY_INTERFACE		-1