[PATCH 3/3] ASoC: wm8998: Fix PM disable depth imbalance on error

Richard Fitzgerald rf at opensource.cirrus.com
Wed Nov 11 10:50:23 CET 2020


On 11/11/2020 04:13, Zhang Qilong wrote:
> The pm_runtime_enable will increase power disable depth. Thus
> a pairing decrement is needed on the error handling path to
> keep it balanced according to context.
> 
> Fixes: 31833ead95c2c ("ASoC: arizona: Move request of speaker IRQs into bus probe")
> Signed-off-by: Zhang Qilong <zhangqilong3 at huawei.com>
> ---
>   sound/soc/codecs/wm8998.c | 4 +++-
>   1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c
> index f6c5cc80c970..5413254295b7 100644
> --- a/sound/soc/codecs/wm8998.c
> +++ b/sound/soc/codecs/wm8998.c
> @@ -1375,7 +1375,7 @@ static int wm8998_probe(struct platform_device *pdev)
>   
>   	ret = arizona_init_spk_irqs(arizona);
>   	if (ret < 0)
> -		return ret;
> +		goto err_pm_disable;
>   
>   	ret = devm_snd_soc_register_component(&pdev->dev,
>   					      &soc_component_dev_wm8998,
> @@ -1390,6 +1390,8 @@ static int wm8998_probe(struct platform_device *pdev)
>   
>   err_spk_irqs:
>   	arizona_free_spk_irqs(arizona);
> +err_pm_disable:
> +	pm_runtime_disable(&pdev->dev);
>   
>   	return ret;
>   }
> 

Reviewed-by: Richard Fitzgerald <rf at opensource.cirrus.com>


More information about the Alsa-devel mailing list