[alsa-devel] [PATCH] ALSA: fm801: add error handling for snd_ctl_add

[Andy Shevchenko]

On Mon, 2018-06-11 at 16:04 +0800, jiazhouyang09 at gmail.com wrote:
> 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.
> 

Acked-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>

Though I can't test this (I have FM-only card). Last person who would
able to test was Émeric (Cc'ed).

> Signed-off-by: Zhouyang Jia <jiazhouyang09 at gmail.com>
> ---
>  sound/pci/fm801.c | 16 ++++++++++++----
>  1 file changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/pci/fm801.c b/sound/pci/fm801.c
> index 73a67bc..e3fb9c6 100644
> --- a/sound/pci/fm801.c
> +++ b/sound/pci/fm801.c
> @@ -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_mult
> i[i], chip));
> +			if (err < 0)
> +				return err;
> +		}
>  	}
>  	return 0;
>  }

-- 
Andy Shevchenko <andriy.shevchenko at linux.intel.com>
Intel Finland Oy