Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 06:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: usb-audio: Register card again for iface over delayed_register option

Browse Source 
When the delayed registration is specified via either delayed_register
option or the quirk, we delay the invocation of snd_card_register()
until the given interface.  But if a wrong value has been set there
and there are more interfaces over the given interface number,
snd_card_register() call would be missing for those interfaces.

This patch catches up those missing calls by fixing the comparison of
the interface number.  Now the call is skipped only if the processed
interface is less than the given interface, instead of the exact
match.

Fixes: b70038ef4f ("ALSA: usb-audio: Add delayed_register option")
Link: https://bugzilla.kernel.org/show_bug.cgi?id=216082
Link: https://lore.kernel.org/r/20220831125901.4660-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2022-08-31 14:59:01 +02:00
parent 7e1afce586
commit 2027f11468
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/usb/card.c
View File

@ -699,7 +699,7 @@ static bool check_delayed_register_option(struct snd_usb_audio *chip, int iface)
if (delayed_register[i] && if (delayed_register[i] &&
sscanf(delayed_register[i], "%x:%x", &id, &inum) == 2 && sscanf(delayed_register[i], "%x:%x", &id, &inum) == 2 &&
id == chip->usb_id) id == chip->usb_id)
return inum != iface; return iface < inum;
} }
return false; return false;

2
sound/usb/quirks.c
View File

@ -1764,7 +1764,7 @@ bool snd_usb_registration_quirk(struct snd_usb_audio *chip, int iface)
for (q = registration_quirks; q->usb_id; q++) for (q = registration_quirks; q->usb_id; q++)
if (chip->usb_id == q->usb_id) if (chip->usb_id == q->usb_id)
return iface != q->interface; return iface < q->interface;
/* Register as normal */ /* Register as normal */
return false; return false;