* [PATCH] ASoC: fsl: Fix PM disable depth imbalance in fsl_easrc_probe
@ 2023-10-04 7:12 Zhang Shurong
2023-10-08 9:37 ` Shengjiu Wang
0 siblings, 1 reply; 2+ messages in thread
From: Zhang Shurong @ 2023-10-04 7:12 UTC (permalink / raw)
To: shengjiu.wang
Cc: alsa-devel, Xiubo.Lee, linuxppc-dev, tiwai, lgirdwood, perex,
nicoleotsuka, broonie, festevam, linux-kernel, Zhang Shurong
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. We fix it by calling
pm_runtime_disable when error returns.
Signed-off-by: Zhang Shurong <zhang_shurong@foxmail.com>
---
sound/soc/fsl/fsl_easrc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c
index ba62995c909a..ec53bda46a46 100644
--- a/sound/soc/fsl/fsl_easrc.c
+++ b/sound/soc/fsl/fsl_easrc.c
@@ -1966,17 +1966,21 @@ static int fsl_easrc_probe(struct platform_device *pdev)
&fsl_easrc_dai, 1);
if (ret) {
dev_err(dev, "failed to register ASoC DAI\n");
- return ret;
+ goto err_pm_disable;
}
ret = devm_snd_soc_register_component(dev, &fsl_asrc_component,
NULL, 0);
if (ret) {
dev_err(&pdev->dev, "failed to register ASoC platform\n");
- return ret;
+ goto err_pm_disable;
}
return 0;
+
+err_pm_disable:
+ pm_runtime_disable(&pdev->dev);
+ return ret;
}
static void fsl_easrc_remove(struct platform_device *pdev)
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ASoC: fsl: Fix PM disable depth imbalance in fsl_easrc_probe
2023-10-04 7:12 [PATCH] ASoC: fsl: Fix PM disable depth imbalance in fsl_easrc_probe Zhang Shurong
@ 2023-10-08 9:37 ` Shengjiu Wang
0 siblings, 0 replies; 2+ messages in thread
From: Shengjiu Wang @ 2023-10-08 9:37 UTC (permalink / raw)
To: Zhang Shurong
Cc: alsa-devel, Xiubo.Lee, linuxppc-dev, tiwai, lgirdwood, perex,
nicoleotsuka, broonie, festevam, linux-kernel
On Wed, Oct 4, 2023 at 3:12 PM Zhang Shurong <zhang_shurong@foxmail.com> 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. We fix it by calling
> pm_runtime_disable when error returns.
>
Please add a Fixes tag.
Thanks.
Best regards
Wang Shengjiu
> Signed-off-by: Zhang Shurong <zhang_shurong@foxmail.com>
> ---
> sound/soc/fsl/fsl_easrc.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_easrc.c b/sound/soc/fsl/fsl_easrc.c
> index ba62995c909a..ec53bda46a46 100644
> --- a/sound/soc/fsl/fsl_easrc.c
> +++ b/sound/soc/fsl/fsl_easrc.c
> @@ -1966,17 +1966,21 @@ static int fsl_easrc_probe(struct platform_device *pdev)
> &fsl_easrc_dai, 1);
> if (ret) {
> dev_err(dev, "failed to register ASoC DAI\n");
> - return ret;
> + goto err_pm_disable;
> }
>
> ret = devm_snd_soc_register_component(dev, &fsl_asrc_component,
> NULL, 0);
> if (ret) {
> dev_err(&pdev->dev, "failed to register ASoC platform\n");
> - return ret;
> + goto err_pm_disable;
> }
>
> return 0;
> +
> +err_pm_disable:
> + pm_runtime_disable(&pdev->dev);
> + return ret;
> }
>
> static void fsl_easrc_remove(struct platform_device *pdev)
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-08 9:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-04 7:12 [PATCH] ASoC: fsl: Fix PM disable depth imbalance in fsl_easrc_probe Zhang Shurong
2023-10-08 9:37 ` Shengjiu Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).