]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
ALSA: usb-audio: Yet more regression for for the delayed card registration
authorTakashi Iwai <tiwai@suse.de>
Tue, 8 Nov 2022 06:58:23 +0000 (07:58 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Wed, 14 Dec 2022 12:59:06 +0000 (13:59 +0100)
commit865924b9668bf7eec7730cea3ad89708f30e3154
treed3e4f26ef7dc3abaa968ec43a52f0503a5ff822a
parent23a2cfc41111cfd907512a7f95cbead7eb8c286f
ALSA: usb-audio: Yet more regression for for the delayed card registration

commit 971cb608d1c5d95533a43b549bb8ec9637f10043 upstream.

Although we tried to fix the regression for the recent changes with
the delayed card registration, it doesn't seem covering the all
cases; e.g. on Roland EDIROL M-100FX, where the generic quirk for
Roland devices is applied, it misses the card registration because the
detection of the last interface (apparently for MIDI) fails.

This patch is an attempt to recover from those failures by calling the
card register also at the error path for the secondary interfaces.
The card register condition is also extended to match with the old
check in the previous patch, too (i.e. the simple check of the
interface number) for catching the probe with errors.

Fixes: 39efc9c8a973 ("ALSA: usb-audio: Fix last interface check for registration")
Cc: <stable@vger.kernel.org>
Link: https://bugzilla.suse.com/show_bug.cgi?id=1205111
Link: https://lore.kernel.org/r/20221108065824.14418-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 031d1480a0f4747524660f8149edd7b25b5c263c)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
sound/usb/card.c