projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
de71d75
)
ASoC: wm5110: Revert "ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe"
author
Zhang Qilong
<zhangqilong3@huawei.com>
Mon, 10 Oct 2022 11:48:51 +0000
(19:48 +0800)
committer
Mark Brown
<broonie@kernel.org>
Mon, 10 Oct 2022 12:01:11 +0000
(13:01 +0100)
This reverts commit
86b46bf1feb83898d89a2b4a8d08d21e9ea277a7
.
The pm_runtime_disable is redundant when error returns in
wm5110_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-3-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/wm5110.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm5110.c
b/sound/soc/codecs/wm5110.c
index 8a61563eae11aafc67604cc02820a29957bb93cf..e0b971620d0fb4da99235c42739bfbc27efd0b7b 100644
(file)
--- a/
sound/soc/codecs/wm5110.c
+++ b/
sound/soc/codecs/wm5110.c
@@
-2457,6
+2457,9
@@
static int wm5110_probe(struct platform_device *pdev)
regmap_update_bits(arizona->regmap, wm5110_digital_vu[i],
WM5110_DIG_VU, WM5110_DIG_VU);
+ pm_runtime_enable(&pdev->dev);
+ pm_runtime_idle(&pdev->dev);
+
ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
"ADSP2 Compressed IRQ", wm5110_adsp2_irq,
wm5110);
@@
-2489,9
+2492,6
@@
static int wm5110_probe(struct platform_device *pdev)
goto err_spk_irqs;
}
- pm_runtime_enable(&pdev->dev);
- pm_runtime_idle(&pdev->dev);
-
return ret;
err_spk_irqs: