[alsa-devel] [PATCH] ASoC: wm_adsp: Check return value from wm_adsp_buffer_init

Takashi Sakamoto o-takashi at sakamocchi.jp
Tue Nov 22 16:22:17 CET 2016


Charles,

On Nov 22 2016 16:46, Charles Keepax wrote:
> We are not checking the return value from a call to wm_adsp_buffer_init
> it looks like this used to be returned at the bottom of the function but
> probably got missed when more error paths were added. This patch adds
> the appropriate error check.
> 
> Signed-off-by: Charles Keepax <ckeepax at opensource.wolfsonmicro.com>
> ---
>  sound/soc/codecs/wm_adsp.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
> index 6ccb731..7e4f8dd 100644
> --- a/sound/soc/codecs/wm_adsp.c
> +++ b/sound/soc/codecs/wm_adsp.c
> @@ -2580,8 +2580,11 @@ int wm_adsp2_event(struct snd_soc_dapm_widget *w,
>  
>  		mutex_lock(&dsp->pwr_lock);
>  
> -		if (wm_adsp_fw[dsp->fw].num_caps != 0)
> +		if (wm_adsp_fw[dsp->fw].num_caps != 0) {
>  			ret = wm_adsp_buffer_init(dsp);
> +			if (ret < 0)
> +				goto err;
> +		}

Need to call mutex_unlock() before jumping to err label?

>  
>  		mutex_unlock(&dsp->pwr_lock);


Regards

Takashi Sakamoto


More information about the Alsa-devel mailing list