Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 07:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: control: Allow NULL passed to snd_ctl_remove()

Browse Source 
There are lots of code checking NULL for kcontrol passed to
snd_ctl_remove() in the caller side.  Let's make snd_ctl_remove()
accepting the NULL kcontrol instead a la free(), so that we can clean
up the caller side.

Link: https://lore.kernel.org/20240617100529.6667-2-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2024-06-17 12:05:23 +02:00
parent 6278056e42
commit e946455ce1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sound/core/control.c
View File

@ -604,6 +604,7 @@ static inline int snd_ctl_remove_locked(struct snd_card *card,
* *
* Removes the control from the card and then releases the instance. * Removes the control from the card and then releases the instance.
* You don't need to call snd_ctl_free_one(). * You don't need to call snd_ctl_free_one().
* Passing NULL to @kcontrol argument is allowed as noop.
* *
* Return: 0 if successful, or a negative error code on failure. * Return: 0 if successful, or a negative error code on failure.
* *
@ -611,6 +612,8 @@ static inline int snd_ctl_remove_locked(struct snd_card *card,
*/ */
int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol) int snd_ctl_remove(struct snd_card *card, struct snd_kcontrol *kcontrol)
{ {
if (!kcontrol)
return 0;
guard(rwsem_write)(&card->controls_rwsem); guard(rwsem_write)(&card->controls_rwsem);
return snd_ctl_remove_locked(card, kcontrol); return snd_ctl_remove_locked(card, kcontrol);
} }