diff mbox series

[v2,-next,2/3] ASoC: wm5110: Revert "ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe"

Message ID 20221010114852.88127-3-zhangqilong3@huawei.com (mailing list archive)
State New
Headers show
Series ASoC: wmxxxx: Revert old "ASoC: wmxxxx: Fix PM disable depth imbalance in wmxxxx_probe" | expand

Commit Message

Zhang Qilong Oct. 10, 2022, 11:48 a.m. UTC
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>
 sound/soc/codecs/wm5110.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series


diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index 8a61563eae11..e0b971620d0f 100644
--- 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,
@@ -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;