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

Richard Fitzgerald rf at opensource.cirrus.com
Wed Nov 11 10:57:30 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: 57e265c8d71fb ("ASoC: wm8994: Move runtime PM init to platform device init")
> Signed-off-by: Zhang Qilong <zhangqilong3 at huawei.com>
> ---
>   sound/soc/codecs/wm8994.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
> index fc9ea198ac79..f57884113406 100644
> --- a/sound/soc/codecs/wm8994.c
> +++ b/sound/soc/codecs/wm8994.c
> @@ -4645,8 +4645,12 @@ static int wm8994_probe(struct platform_device *pdev)
>   	pm_runtime_enable(&pdev->dev);
>   	pm_runtime_idle(&pdev->dev);
>   
> -	return devm_snd_soc_register_component(&pdev->dev, &soc_component_dev_wm8994,
> +	ret = devm_snd_soc_register_component(&pdev->dev, &soc_component_dev_wm8994,
>   			wm8994_dai, ARRAY_SIZE(wm8994_dai));
> +	if (ret < 0)
> +		pm_runtime_disable(&pdev->dev);
> +
> +	return ret;
>   }
>   
>   static int wm8994_remove(struct platform_device *pdev)
> 

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


More information about the Alsa-devel mailing list