AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: fm801: add error handling for snd_ctl_add

Browse Source 
When snd_ctl_add fails, the lack of error-handling code may
cause unexpected results.

This patch adds error-handling code after calling snd_ctl_add.

Signed-off-by: Zhouyang Jia <jiazhouyang09@gmail.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Zhouyang Jia 2018-06-11 16:04:06 +08:00 committed by Takashi Iwai
parent d4d5a1cd29
commit ef1ffbe788
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/fm801.c
View File

@ -1068,11 +1068,19 @@ static int snd_fm801_mixer(struct fm801 *chip)
if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_sec)) < 0) if ((err = snd_ac97_mixer(chip->ac97_bus, &ac97, &chip->ac97_sec)) < 0)
return err; return err;
} }
for (i = 0; i < FM801_CONTROLS; i++) for (i = 0; i < FM801_CONTROLS; i++) {
snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls[i], chip)); err = snd_ctl_add(chip->card,
snd_ctl_new1(&snd_fm801_controls[i], chip));
if (err < 0)
return err;
}
if (chip->multichannel) { if (chip->multichannel) {
for (i = 0; i < FM801_CONTROLS_MULTI; i++) for (i = 0; i < FM801_CONTROLS_MULTI; i++) {
snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls_multi[i], chip)); err = snd_ctl_add(chip->card,
snd_ctl_new1(&snd_fm801_controls_multi[i], chip));
if (err < 0)
return err;
}
} }
return 0; return 0;
} }