]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: stm32: dfsdm: Fix PM disable depth imbalance in stm32_adfsdm_probe
authorZhang Qilong <zhangqilong3@huawei.com>
Tue, 27 Sep 2022 14:26:00 +0000 (22:26 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Oct 2022 07:57:22 +0000 (09:57 +0200)
[ Upstream commit b9a0da5b2edcae2a901b85c8cc42efc5bec4bd7b ]

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>
Reviewed-by: Olivier Moysan <olivier.moysan@foss.st.com>
Link: https://lore.kernel.org/r/20220927142601.64266-2-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/stm/stm32_adfsdm.c

index 6ee714542b84a1a9643cfa476db5583927fe337e..c0f964891b584c81e54b2542fa58d8f30eb8bf9c 100644 (file)
@@ -334,8 +334,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);
@@ -365,9 +363,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;
 }