From: Zhang Qilong Date: Wed, 28 Sep 2022 16:01:13 +0000 (+0800) Subject: ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe X-Git-Tag: baikal/aarch64/sdk5.9~1549 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=6803753cce3b598ba1ca157b489c0819b79930d2;p=kernel.git ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe [ Upstream commit 5cc6cfe189af891de4108cf18244a36b1c3d9a04 ] 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:2b14cf4620c7c ("ASoC: wm8997: Initial CODEC driver") Signed-off-by: Zhang Qilong Link: https://lore.kernel.org/r/20220928160116.125020-2-zhangqilong3@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- diff --git a/sound/soc/codecs/wm8997.c b/sound/soc/codecs/wm8997.c index 229f2986cd96b..07378714b013a 100644 --- a/sound/soc/codecs/wm8997.c +++ b/sound/soc/codecs/wm8997.c @@ -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: