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

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

ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe 



[ Upstream commit 41a736ac20602f64773e80f0f5b32cde1830a44a ]

The pm_runtime_enable will increase power disable depth. Thus
a pairing decrement is needed on the error handling path to
keep it balanced according to context. We fix it by moving
pm_runtime_enable to the endding of wm8997_probe

Fixes:40843aea ("ASoC: wm8997: Initial CODEC driver")

Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20220928160116.125020-2-zhangqilong3@huawei.com


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

sound/soc/codecs/wm8997.c

+3 −3
Original line number Diff line number Diff line
@@ -1156,9 +1156,6 @@ 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);
@@ -1177,6 +1174,9 @@ 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: