mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 20:51:44 +00:00
ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe
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 wm5110_probe. Fixes:5c6af635fd772 ("ASoC: wm5110: Add audio CODEC driver") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Link: https://lore.kernel.org/r/20220928160116.125020-3-zhangqilong3@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
41a736ac20
commit
86b46bf1fe
@ -2457,9 +2457,6 @@ static int wm5110_probe(struct platform_device *pdev)
|
|||||||
regmap_update_bits(arizona->regmap, wm5110_digital_vu[i],
|
regmap_update_bits(arizona->regmap, wm5110_digital_vu[i],
|
||||||
WM5110_DIG_VU, WM5110_DIG_VU);
|
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,
|
ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1,
|
||||||
"ADSP2 Compressed IRQ", wm5110_adsp2_irq,
|
"ADSP2 Compressed IRQ", wm5110_adsp2_irq,
|
||||||
wm5110);
|
wm5110);
|
||||||
@ -2492,6 +2489,9 @@ static int wm5110_probe(struct platform_device *pdev)
|
|||||||
goto err_spk_irqs;
|
goto err_spk_irqs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pm_runtime_enable(&pdev->dev);
|
||||||
|
pm_runtime_idle(&pdev->dev);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
err_spk_irqs:
|
err_spk_irqs:
|
||||||
|
Loading…
Reference in New Issue
Block a user