diff options
| author |   Zhang Qilong <zhangqilong3@huawei.com> | 2022-09-29 00:01:14 +0800 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-09-29 16:16:22 +0100 |
| commit | 86b46bf1feb83898d89a2b4a8d08d21e9ea277a7 (patch) | |
| tree | edb06d1f124c2513cfbcd80d2039bdd94f7534f2 /sound/soc | |
| parent | ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe (diff) | |
| download | linux-dev-86b46bf1feb83898d89a2b4a8d08d21e9ea277a7.tar.xz linux-dev-86b46bf1feb83898d89a2b4a8d08d21e9ea277a7.zip | |
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>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm5110.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c index f3f4a10bf0f7..fc634c995834 100644 --- a/sound/soc/codecs/wm5110.c +++ b/sound/soc/codecs/wm5110.c @@ -2457,9 +2457,6 @@ 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); @@ -2492,6 +2489,9 @@ 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: |