Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef1ffbe7 authored by Zhouyang Jia's avatar Zhouyang Jia Committed by Takashi Iwai
Browse files

ALSA: fm801: add error handling for snd_ctl_add 



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: default avatarZhouyang Jia <jiazhouyang09@gmail.com>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent d4d5a1cd

sound/pci/fm801.c

+12 −4
Original line number Diff line number Diff line
@@ -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)

			return err;

	}

	for (i = 0; i < FM801_CONTROLS; i++)

		snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls[i], chip));

	for (i = 0; i < FM801_CONTROLS; i++) {

		err = snd_ctl_add(chip->card,

			snd_ctl_new1(&snd_fm801_controls[i], chip));

		if (err < 0)

			return err;

	}

	if (chip->multichannel) {

		for (i = 0; i < FM801_CONTROLS_MULTI; i++)

			snd_ctl_add(chip->card, snd_ctl_new1(&snd_fm801_controls_multi[i], chip));

		for (i = 0; i < FM801_CONTROLS_MULTI; i++) {

			err = snd_ctl_add(chip->card,

				snd_ctl_new1(&snd_fm801_controls_multi[i], chip));

			if (err < 0)

				return err;

		}

	}

	return 0;

}