]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ASoC: mediatek: mt8183: Check runtime resume during probe
authorCássio Gabriel <cassiogabrielcontato@gmail.com>
Wed, 27 May 2026 13:41:49 +0000 (10:41 -0300)
committerMark Brown <broonie@kernel.org>
Tue, 2 Jun 2026 15:10:35 +0000 (16:10 +0100)
The MT8183 AFE probe uses pm_runtime_get_sync() before reading hardware
defaults into the regmap cache, but does not check whether runtime resume
failed. If regmap_reinit_cache() then fails, the temporary runtime PM
usage count is also not released.

Use pm_runtime_resume_and_get() so resume failures abort probe without
leaking a usage count, and release the temporary reference before
handling the regmap cache result.

Fixes: a94aec035a12 ("ASoC: mediatek: mt8183: add platform driver")
Cc: stable@vger.kernel.org
Signed-off-by: Cássio Gabriel <cassiogabrielcontato@gmail.com>
Link: https://patch.msgid.link/20260527-asoc-mt8183-probe-cleanup-v1-2-4f4f5593c8d1@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/mediatek/mt8183/mt8183-afe-pcm.c

index 49a69728fd723432f0b1894af255ac0604b67b12..2634699534db725977e6ac702bca2911b54e0933 100644 (file)
@@ -844,17 +844,21 @@ static int mt8183_afe_pcm_dev_probe(struct platform_device *pdev)
 
        /* enable clock for regcache get default value from hw */
        afe_priv->pm_runtime_bypass_reg_ctl = true;
-       pm_runtime_get_sync(dev);
-
-       ret = regmap_reinit_cache(afe->regmap, &mt8183_afe_regmap_config);
+       ret = pm_runtime_resume_and_get(dev);
        if (ret) {
-               dev_err(dev, "regmap_reinit_cache fail, ret %d\n", ret);
+               afe_priv->pm_runtime_bypass_reg_ctl = false;
                goto err_pm_disable;
        }
 
+       ret = regmap_reinit_cache(afe->regmap, &mt8183_afe_regmap_config);
        pm_runtime_put_sync(dev);
        afe_priv->pm_runtime_bypass_reg_ctl = false;
 
+       if (ret) {
+               dev_err(dev, "regmap_reinit_cache fail, ret %d\n", ret);
+               goto err_pm_disable;
+       }
+
        regcache_cache_only(afe->regmap, true);
        regcache_mark_dirty(afe->regmap);