summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorZhang Qilong <zhangqilong3@huawei.com>2022-09-29 00:01:13 +0800
committerMark Brown <broonie@kernel.org>2022-09-29 16:16:21 +0100
commit41a736ac20602f64773e80f0f5b32cde1830a44a (patch)
tree87973a3672bb619b8cc94a612bb0db7c369e49eb /sound
parent65c94e4d15830406a31a55085887e97bacd25434 (diff)
downloadlinux-stable-41a736ac20602f64773e80f0f5b32cde1830a44a.tar.gz
linux-stable-41a736ac20602f64773e80f0f5b32cde1830a44a.tar.bz2
linux-stable-41a736ac20602f64773e80f0f5b32cde1830a44a.zip
ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe
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 wm8997_probe Fixes:40843aea5a9bd ("ASoC: wm8997: Initial CODEC driver") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Link: https://lore.kernel.org/r/20220928160116.125020-2-zhangqilong3@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8997.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c
index 210ad662fc26..77136a521605 100644
--- a/sound/soc/codecs/wm8997.c
+++ b/sound/soc/codecs/wm8997.c
@@ -1161,9 +1161,6 @@ static int wm8997_probe(struct platform_device *pdev)
regmap_update_bits(arizona->regmap, wm8997_digital_vu[i],
WM8997_DIG_VU, WM8997_DIG_VU);
- pm_runtime_enable(&pdev->dev);
- pm_runtime_idle(&pdev->dev);
-
arizona_init_common(arizona);
ret = arizona_init_vol_limit(arizona);
@@ -1182,6 +1179,9 @@ static int wm8997_probe(struct platform_device *pdev)
goto err_spk_irqs;
}
+ pm_runtime_enable(&pdev->dev);
+ pm_runtime_idle(&pdev->dev);
+
return ret;
err_spk_irqs: