diff options
author | Zhang Qilong <zhangqilong3@huawei.com> | 2022-09-29 00:01:15 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2022-09-29 16:16:23 +0100 |
commit | fcbb60820cd3008bb44334a0395e5e57ccb77329 (patch) | |
tree | 2a436bb30899050100ce7b3a0bce769ed5bb9840 /sound | |
parent | 86b46bf1feb83898d89a2b4a8d08d21e9ea277a7 (diff) | |
download | linux-stable-fcbb60820cd3008bb44334a0395e5e57ccb77329.tar.gz linux-stable-fcbb60820cd3008bb44334a0395e5e57ccb77329.tar.bz2 linux-stable-fcbb60820cd3008bb44334a0395e5e57ccb77329.zip |
ASoC: wm5102: Fix PM disable depth imbalance in wm5102_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 wm5102_probe.
Fixes:93e8791dd34ca ("ASoC: wm5102: Initial driver")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20220928160116.125020-4-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm5102.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index af7d324e3352..c09c9ac51b3e 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -2099,9 +2099,6 @@ static int wm5102_probe(struct platform_device *pdev) regmap_update_bits(arizona->regmap, wm5102_digital_vu[i], WM5102_DIG_VU, WM5102_DIG_VU); - pm_runtime_enable(&pdev->dev); - pm_runtime_idle(&pdev->dev); - ret = arizona_request_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, "ADSP2 Compressed IRQ", wm5102_adsp2_irq, wm5102); @@ -2134,6 +2131,9 @@ static int wm5102_probe(struct platform_device *pdev) goto err_spk_irqs; } + pm_runtime_enable(&pdev->dev); + pm_runtime_idle(&pdev->dev); + return ret; err_spk_irqs: |