diff mbox series

[v2,-next,2/4] ASoC: wm5110: Fix PM disable depth imbalance in wm5110_probe

Message ID 20220929150653.63845-3-zhangqilong3@huawei.com (mailing list archive)
State Accepted
Commit 6ab646c985b529a32bf162de48d2d4a8bb7c9b64
Headers show
Series Fix PM disable depth imbalance in probe | expand

Commit Message

Zhang Qilong Sept. 29, 2022, 3:06 p.m. UTC 
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 calling
pm_runtime_enable when error returns.

Fixes:5c6af635fd772 ("ASoC: wm5110: Add audio CODEC driver")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
---
v2:
- call pm_runtime_disable when error returns.
---
 sound/soc/codecs/wm5110.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Charles Keepax Oct. 3, 2022, 10:05 a.m. UTC | #1 
On Thu, Sep 29, 2022 at 11:06:51PM +0800, Zhang Qilong wrote:
> 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 calling
> pm_runtime_enable when error returns.
> 
> Fixes:5c6af635fd772 ("ASoC: wm5110: Add audio CODEC driver")
> Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
> ---
> v2:
> - call pm_runtime_disable when error returns.
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles
diff mbox series

Patch

diff --git a/sound/soc/codecs/wm5110.c b/sound/soc/codecs/wm5110.c
index f3f4a10bf0f7..e0b971620d0f 100644
--- a/sound/soc/codecs/wm5110.c
+++ b/sound/soc/codecs/wm5110.c
@@ -2500,6 +2500,7 @@  static int wm5110_probe(struct platform_device *pdev)
 	arizona_set_irq_wake(arizona, ARIZONA_IRQ_DSP_IRQ1, 0);
 	arizona_free_irq(arizona, ARIZONA_IRQ_DSP_IRQ1, wm5110);
 err_jack_codec_dev:
+	pm_runtime_disable(&pdev->dev);
 	arizona_jack_codec_dev_remove(&wm5110->core);
 
 	return ret;