projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b2bc9fc
)
ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe
author
Zhang Qilong
<zhangqilong3@huawei.com>
Wed, 28 Sep 2022 16:01:14 +0000
(
00:01
+0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 10:34:57 +0000
(12:34 +0200)
[ Upstream commit
86b46bf1feb83898d89a2b4a8d08d21e9ea277a7
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/wm5110.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm5110.c
b/sound/soc/codecs/wm5110.c
index 7c6e01720d6517433e596c365f301020d9f73a5c..66a4827c16bd66134fb724fb9308bb4be5f3649d 100644
(file)
--- a/
sound/soc/codecs/wm5110.c
+++ b/
sound/soc/codecs/wm5110.c
@@
-2458,9
+2458,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);
@@
-2493,6
+2490,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: