Unverified Commit 193aa0a0 authored Nov 11, 2020 by Zhang Qilong Committed by Mark Brown Nov 11, 2020

ASoC: wm8998: Fix PM disable depth imbalance on error



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.

Fixes: 31833ead ("ASoC: arizona: Move request of speaker IRQs into bus probe")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20201111041326.1257558-4-zhangqilong3@huawei.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent b8161cbe

sound/soc/codecs/wm8998.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1375,7 +1375,7 @@ static int wm8998_probe(struct platform_device *pdev)

		ret = arizona_init_spk_irqs(arizona);
		if (ret < 0)
		return ret;
		goto err_pm_disable;

		ret = devm_snd_soc_register_component(&pdev->dev,
		&soc_component_dev_wm8998,
		@@ -1390,6 +1390,8 @@ static int wm8998_probe(struct platform_device *pdev)

		err_spk_irqs:
		arizona_free_spk_irqs(arizona);
		err_pm_disable:
		pm_runtime_disable(&pdev->dev);

		return ret;
		}

Admin message