| Message ID | 20220926141132.124245-2-zhangqilong3@huawei.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Fix PM disable depth imbalance in stm32 probe | expand |
Hi Zhang, Thanks.You can add my: Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com> BRs On 9/26/22 16:11, 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. We fix it by moving > pm_runtime_enable to the endding of stm32_adfsdm_probe. > > Fixes:98e500a12f934 ("ASoC: stm32: dfsdm: add pm_runtime support for audio") > Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> > --- > sound/soc/stm/stm32_adfsdm.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c > index 04f2912e1418..643fc8a17018 100644 > --- a/sound/soc/stm/stm32_adfsdm.c > +++ b/sound/soc/stm/stm32_adfsdm.c > @@ -335,8 +335,6 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) > > dev_set_drvdata(&pdev->dev, priv); > > - pm_runtime_enable(&pdev->dev); > - > ret = devm_snd_soc_register_component(&pdev->dev, > &stm32_adfsdm_dai_component, > &priv->dai_drv, 1); > @@ -366,9 +364,13 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) > #endif > > ret = snd_soc_add_component(component, NULL, 0); > - if (ret < 0) > + if (ret < 0) { > dev_err(&pdev->dev, "%s: Failed to register PCM platform\n", > __func__); > + return ret; > + } > + > + pm_runtime_enable(&pdev->dev); > > return ret; > }
diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index 04f2912e1418..643fc8a17018 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -335,8 +335,6 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) dev_set_drvdata(&pdev->dev, priv); - pm_runtime_enable(&pdev->dev); - ret = devm_snd_soc_register_component(&pdev->dev, &stm32_adfsdm_dai_component, &priv->dai_drv, 1); @@ -366,9 +364,13 @@ static int stm32_adfsdm_probe(struct platform_device *pdev) #endif ret = snd_soc_add_component(component, NULL, 0); - if (ret < 0) + if (ret < 0) { dev_err(&pdev->dev, "%s: Failed to register PCM platform\n", __func__); + return ret; + } + + pm_runtime_enable(&pdev->dev); return ret; }
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 moving pm_runtime_enable to the endding of stm32_adfsdm_probe. Fixes:98e500a12f934 ("ASoC: stm32: dfsdm: add pm_runtime support for audio") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> --- sound/soc/stm/stm32_adfsdm.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)