]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: ak4458: Disable regulator when error happens
authorShengjiu Wang <shengjiu.wang@nxp.com>
Wed, 3 Dec 2025 10:05:28 +0000 (18:05 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 19 Jan 2026 12:09:38 +0000 (13:09 +0100)
[ Upstream commit ae585fabb9713a43e358cf606451386757225c95 ]

Disable regulator in runtime resume when error happens to balance
the reference count of regulator.

Fixes: 7e3096e8f823 ("ASoC: ak4458: Add regulator support")
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Link: https://patch.msgid.link/20251203100529.3841203-2-shengjiu.wang@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/ak4458.c

index 29eb78702bf35cd83b5dfae6e20987878cec5536..1c179df6f092686a181bbc4a5456fe46c01e1d90 100644 (file)
@@ -709,7 +709,15 @@ static int __maybe_unused ak4458_runtime_resume(struct device *dev)
        regcache_cache_only(ak4458->regmap, false);
        regcache_mark_dirty(ak4458->regmap);
 
-       return regcache_sync(ak4458->regmap);
+       ret = regcache_sync(ak4458->regmap);
+       if (ret)
+               goto err;
+
+       return 0;
+err:
+       regcache_cache_only(ak4458->regmap, true);
+       regulator_bulk_disable(ARRAY_SIZE(ak4458->supplies), ak4458->supplies);
+       return ret;
 }
 #endif /* CONFIG_PM */