Re: [PATCH V2] ASoC: fsl_xcvr:Fix unbalanced pm_runtime_enable in fsl_xcvr_probe

From
Shengjiu Wang <shengjiu.wang@gmail.com>
Date
2022-06-02 06:11:57
Also in
alsa-devel
Reply to
zhangqilong, 2022-05-30
On Mon, May 30, 2022 at 4:33 PM zhangqilong [off-list ref] wrote:
a) Add missing pm_runtime_disable() when probe error out. It could
avoid pm_runtime implementation complains when removing and probing
again the driver.
b) Add remove for missing pm_runtime_disable().

v2: add remove to put PM usage counter.
Fix:c590fa80b3928 ("ASoC: fsl_xcvr: register platform component before
registering cpu dai")
Signed-off-by: Zhang Qilong <redacted>
---
 The changelog should be in the place after "---"

Best regards
Wang shengjiu

 sound/soc/fsl/fsl_xcvr.c | 9 +++++++++
quoted hunk ↗ jump to hunk
 1 file changed, 9 insertions(+)
diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
index d0556c79fdb1..55e640cba87d 100644
--- a/sound/soc/fsl/fsl_xcvr.c
+++ b/sound/soc/fsl/fsl_xcvr.c
@@ -1228,6 +1228,7 @@ static int fsl_xcvr_probe(struct platform_device
*pdev)
         */
        ret = devm_snd_dmaengine_pcm_register(dev, NULL, 0);
        if (ret) {
+               pm_runtime_disable(dev);
                dev_err(dev, "failed to pcm register\n");
                return ret;
        }
@@ -1235,6 +1236,7 @@ static int fsl_xcvr_probe(struct platform_device
*pdev)
        ret = devm_snd_soc_register_component(dev, &fsl_xcvr_comp,
                                              &fsl_xcvr_dai, 1);
        if (ret) {
+               pm_runtime_disable(dev);
                dev_err(dev, "failed to register component %s\n",
                        fsl_xcvr_comp.name);
        }
@@ -1242,6 +1244,12 @@ static int fsl_xcvr_probe(struct platform_device
*pdev)
        return ret;
 }

+static int fsl_xcvr_remove(struct platform_device *pdev)
+{
+       pm_runtime_disable(&pdev->dev);
+       return 0;
+}
+
 static __maybe_unused int fsl_xcvr_runtime_suspend(struct device *dev)
 {
        struct fsl_xcvr *xcvr = dev_get_drvdata(dev);
@@ -1370,6 +1378,7 @@ static struct platform_driver fsl_xcvr_driver = {
                .pm = &fsl_xcvr_pm_ops,
                .of_match_table = fsl_xcvr_dt_ids,
        },
+       .remove = fsl_xcvr_remove,
 };
 module_platform_driver(fsl_xcvr_driver);

--
2.31.1
Thread (2 messages) 2 messages, 2 authors, last reply 2022-06-02
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help