UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: ice1712: Use the standard snd_ctl_add_followers() helper 

Instead of open-code, use the new standard helper to manage vmaster
stuff for code simplification.

Also, handle the errors from the helper more properly instead of
silently ignoring.

The code changes the call order of snd_ctl_add() of the vmaster object
and its followers for avoiding the possible memory leaks at error
path.  But there should be no difference in the functionality.

Link: https://lore.kernel.org/r/20230721071643.3631-5-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2023-07-21 09:16:43 +02:00
parent b7bb11fa36
commit 157ac57073
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sound/pci/ice1712/juli.c
View File

@ -408,21 +408,6 @@ static const char * const follower_vols[] = {
static
DECLARE_TLV_DB_SCALE(juli_master_db_scale, -6350, 50, 1);
static void add_followers(struct snd_card *card,
struct snd_kcontrol *master,
const char * const *list)
{
for (; *list; list++) {
struct snd_kcontrol *follower =
snd_ctl_find_id_mixer(card, *list);
/* dev_dbg(card->dev, "add_followers - %s\n", *list); */
if (follower) {
/* dev_dbg(card->dev, "follower %s found\n", *list); */
snd_ctl_add_follower(master, follower);
}
}
}
static int juli_add_controls(struct snd_ice1712 *ice)
{
struct juli_spec *spec = ice->spec;
@ -445,8 +430,10 @@ static int juli_add_controls(struct snd_ice1712 *ice)
juli_master_db_scale);
if (!vmaster)
return -ENOMEM;
add_followers(ice->card, vmaster, follower_vols);
err = snd_ctl_add(ice->card, vmaster);
if (err < 0)
return err;
err = snd_ctl_add_followers(ice->card, vmaster, follower_vols);
if (err < 0)
return err;

15
sound/pci/ice1712/quartet.c
View File

@ -766,17 +766,6 @@ static const char * const follower_vols[] = {
static
DECLARE_TLV_DB_SCALE(qtet_master_db_scale, -6350, 50, 1);
static void add_followers(struct snd_card *card,
struct snd_kcontrol *master, const char * const *list)
{
for (; *list; list++) {
struct snd_kcontrol *follower =
snd_ctl_find_id_mixer(card, *list);
if (follower)
snd_ctl_add_follower(master, follower);
}
}
static int qtet_add_controls(struct snd_ice1712 *ice)
{
struct qtet_spec *spec = ice->spec;
@ -797,8 +786,10 @@ static int qtet_add_controls(struct snd_ice1712 *ice)
qtet_master_db_scale);
if (!vmaster)
return -ENOMEM;
add_followers(ice->card, vmaster, follower_vols);
err = snd_ctl_add(ice->card, vmaster);
if (err < 0)
return err;
err = snd_ctl_add_followers(ice->card, vmaster, follower_vols);
if (err < 0)
return err;
/* only capture SPDIF over AK4113 */