diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2022-09-15 10:59:47 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-09-15 11:00:21 +0200 |
| commit | 39efc9c8a973ddff5918191525d1679d0fb368ea (patch) | |
| tree | c7056718ac7b7c58cdee2467d0203270620f74c1 /sound/usb | |
| parent | ASoC: Intel: fix unused-variable warning in probe_codec (diff) | |
| download | linux-dev-39efc9c8a973ddff5918191525d1679d0fb368ea.tar.xz linux-dev-39efc9c8a973ddff5918191525d1679d0fb368ea.zip | |
ALSA: usb-audio: Fix last interface check for registration
The recent fix in commit 6392dcd1d0c7 ("ALSA: usb-audio: Register card
at the last interface") tried to delay the card registration until the
last found interface is probed. It assumed that the probe callback
gets called for those later interfaces, but it's not always true; as
the driver loops over the descriptor and probes the matching ones,
it's not separately called via multiple probe calls. This results in
the missing card registration, i.e. no sound device.
For addressing this problem, replace the check whether the last
interface is processed with usb_interface_claimed() instead of the
comparison with the probe interface number.
Fixes: 6392dcd1d0c7 ("ALSA: usb-audio: Register card at the last interface")
Link: https://lore.kernel.org/r/20220915085947.7922-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 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c index 3aea241435fb..a5ed11ea1145 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -884,7 +884,7 @@ static int usb_audio_probe(struct usb_interface *intf, * one given via option */ if (check_delayed_register_option(chip) == ifnum || - chip->last_iface == ifnum) { + usb_interface_claimed(usb_ifnum_to_if(dev, chip->last_iface))) { err = snd_card_register(chip->card); if (err < 0) goto __error; |