Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d487873 authored by Zhang Qilong's avatar Zhang Qilong Committed by Greg Kroah-Hartman
Browse files

ASoC: wm5110: Revert "ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe" 



[ Upstream commit 7d4e966f4cd73ff69bf06934e8e14a33fb7ef447 ]

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: default avatarZhang Qilong <zhangqilong3@huawei.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20221010114852.88127-3-zhangqilong3@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f0901e15

sound/soc/codecs/wm5110.c

+3 −3
Original line number Diff line number Diff line
@@ -2452,6 +2452,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);
@@ -2484,9 +2487,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: