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

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

Fixes:32a956a1fadf ("ASoC: stm32: i2s: 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/20220927142640.64647-1-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/stm/stm32_i2s.c

index ac5dff4d1677a98519ba8623018551798dc464cc..d9e622f4c42211018c35abf09a4a93afe10038af 100644 (file)
@@ -1135,8 +1135,6 @@ static int stm32_i2s_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, PTR_ERR(i2s->regmap),
                                     "Regmap init error\n");
 
-       pm_runtime_enable(&pdev->dev);
-
        ret = snd_dmaengine_pcm_register(&pdev->dev, &stm32_i2s_pcm_config, 0);
        if (ret)
                return dev_err_probe(&pdev->dev, ret, "PCM DMA register error\n");
@@ -1179,6 +1177,8 @@ static int stm32_i2s_probe(struct platform_device *pdev)
                        FIELD_GET(I2S_VERR_MIN_MASK, val));
        }
 
+       pm_runtime_enable(&pdev->dev);
+
        return ret;
 
 error: