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

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_spdifrx_probe.

Fixes:ac5e3efd55868 ("ASoC: stm32: spdifrx: add pm_runtime support")

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-3-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/stm/stm32_spdifrx.c

index 6f7882c4fe6ad101c841807bc0a3762e5b51e5c8..60be4894e5fdc91cc1ac01b3777f9eb2d3d14793 100644 (file)
@@ -1001,8 +1001,6 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
        udelay(2);
        reset_control_deassert(rst);
 
-       pm_runtime_enable(&pdev->dev);
-
        pcm_config = &stm32_spdifrx_pcm_config;
        ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config, 0);
        if (ret)
@@ -1035,6 +1033,8 @@ static int stm32_spdifrx_probe(struct platform_device *pdev)
                        FIELD_GET(SPDIFRX_VERR_MIN_MASK, ver));
        }
 
+       pm_runtime_enable(&pdev->dev);
+
        return ret;
 
 error: