summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorZhang Qilong <zhangqilong3@huawei.com>2022-10-10 19:48:51 +0800
committerMark Brown <broonie@kernel.org>2022-10-10 13:01:11 +0100
commit7d4e966f4cd73ff69bf06934e8e14a33fb7ef447 (patch)
tree0d6b3be32ee7c5581ba473dfb512dade824325f7 /sound
parentde71d7567e358effd06dfc3e2a154b25f1331c10 (diff)
downloadlinux-7d4e966f4cd73ff69bf06934e8e14a33fb7ef447.tar.gz
linux-7d4e966f4cd73ff69bf06934e8e14a33fb7ef447.tar.bz2
linux-7d4e966f4cd73ff69bf06934e8e14a33fb7ef447.zip
ASoC: wm5110: Revert "ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe"
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm5110.c6
1 files changed, 3 insertions, 3 deletions
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,
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: