diff options
| author | Zhang Qilong <zhangqilong3@huawei.com> | 2020-11-11 12:13:26 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-11 12:35:09 +0000 |
| commit | 193aa0a043645220d2a2f783ba06ae13d4601078 (patch) | |
| tree | 623ba71aa950b726e81d96b95c5174972ab35adb | |
| parent | b8161cbe55a1892a19a318eaebbda92438fa708c (diff) | |
| download | linux-stable-193aa0a043645220d2a2f783ba06ae13d4601078.tar.gz linux-stable-193aa0a043645220d2a2f783ba06ae13d4601078.tar.bz2 linux-stable-193aa0a043645220d2a2f783ba06ae13d4601078.zip | |
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: 31833ead95c2c ("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>
| -rw-r--r-- | sound/soc/codecs/wm8998.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8998.c b/sound/soc/codecs/wm8998.c index f6c5cc80c970..5413254295b7 100644 --- a/sound/soc/codecs/wm8998.c +++ b/sound/soc/codecs/wm8998.c @@ -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; } |