diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2021-04-08 09:56:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-04-09 09:57:30 +0200 |
| commit | d763145312582c08c4e9ed99d61276cde8488256 (patch) | |
| tree | 7922baf73f4c8fe5dc7b0799b8f805bec5a9e1fb /sound/usb | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| download | linux-dev-d763145312582c08c4e9ed99d61276cde8488256.tar.xz linux-dev-d763145312582c08c4e9ed99d61276cde8488256.zip | |
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: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/card.c | 2 | ||||
| -rw-r--r-- | sound/usb/quirks-table.h | 21 | ||||
| -rw-r--r-- | sound/usb/usbaudio.h | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 7b7526d3a56e..2f6a62416c05 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -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) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 9716a9f7c095..92f525b1c992 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -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 | diff --git a/sound/usb/usbaudio.h b/sound/usb/usbaudio.h index 8794c8658ab9..a536ee33d36e 100644 --- a/sound/usb/usbaudio.h +++ b/sound/usb/usbaudio.h @@ -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 |