projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b7dda65
)
ASoC: wm5102: Fix PM disable depth imbalance in wm5102_probe
author
Zhang Qilong
<zhangqilong3@huawei.com>
Wed, 28 Sep 2022 16:01:15 +0000
(
00:01
+0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 10:34:57 +0000
(12:34 +0200)
[ Upstream commit
fcbb60820cd3008bb44334a0395e5e57ccb77329
]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/wm5102.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm5102.c
b/sound/soc/codecs/wm5102.c
index 621598608bf0b7876f32ebe2906d864131485a7c..c8adce8936bcda6a6b4b9cca8e34e280500a9f22 100644
(file)
--- a/
sound/soc/codecs/wm5102.c
+++ b/
sound/soc/codecs/wm5102.c
@@
-2087,9
+2087,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);
@@
-2122,6
+2119,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: