projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d4e966
)
ASoC: wm8997: Revert "ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe"
author
Zhang Qilong
<zhangqilong3@huawei.com>
Mon, 10 Oct 2022 11:48:52 +0000
(19:48 +0800)
committer
Mark Brown
<broonie@kernel.org>
Mon, 10 Oct 2022 12:01:12 +0000
(13:01 +0100)
This reverts commit
41a736ac20602f64773e80f0f5b32cde1830a44a
.
The pm_runtime_disable is redundant when error returns in
wm8997_probe, we just revert the old patch to fix it.
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link:
https://lore.kernel.org/r/20221010114852.88127-4-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm8997.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm8997.c
b/sound/soc/codecs/wm8997.c
index f8993176d5c0b80f52054309404e3ada35565237..c0207e9a7d53a020343b8ff93f186fbeafed6808 100644
(file)
--- a/
sound/soc/codecs/wm8997.c
+++ b/
sound/soc/codecs/wm8997.c
@@
-1161,6
+1161,9
@@
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);
@@
-1179,9
+1182,6
@@
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: