projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3c3ef19
)
ASoC: wm8997: Fix PM disable depth imbalance in wm8997_probe
author
Zhang Qilong
<zhangqilong3@huawei.com>
Wed, 28 Sep 2022 16:01:13 +0000
(
00:01
+0800)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 26 Oct 2022 10:34:56 +0000
(12:34 +0200)
[ Upstream commit
41a736ac20602f64773e80f0f5b32cde1830a44a
]
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 wm8997_probe
Fixes:
40843aea5a9bd
("ASoC: wm8997: Initial CODEC driver")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Link:
https://lore.kernel.org/r/20220928160116.125020-2-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/codecs/wm8997.c
patch
|
blob
|
history
diff --git
a/sound/soc/codecs/wm8997.c
b/sound/soc/codecs/wm8997.c
index 38ef631d1a1ff825a60064e822464d389e32aaa9..c8c711e555c0ede0172d82ac6ab61e184e4761fd 100644
(file)
--- a/
sound/soc/codecs/wm8997.c
+++ b/
sound/soc/codecs/wm8997.c
@@
-1162,9
+1162,6
@@
static int wm8997_probe(struct platform_device *pdev)
regmap_update_bits(arizona->regmap, wm8997_digital_vu[i],
WM8997_DIG_VU, WM8997_DIG_VU);
- pm_runtime_enable(&pdev->dev);
- pm_runtime_idle(&pdev->dev);
-
arizona_init_common(arizona);
ret = arizona_init_vol_limit(arizona);
@@
-1183,6
+1180,9
@@
static int wm8997_probe(struct platform_device *pdev)
goto err_spk_irqs;
}
+ pm_runtime_enable(&pdev->dev);
+ pm_runtime_idle(&pdev->dev);
+
return ret;
err_spk_irqs: