diff options
| author | Zhang Qilong <zhangqilong3@huawei.com> | 2020-11-11 05:13:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-11-11 13:35:08 +0100 |
| commit | b8161cbe55a1892a19a318eaebbda92438fa708c (patch) | |
| tree | 5f8bbf169cd3089f9fbb31a0e9b912086826c64b | |
| parent | Merge series "Audio Graph Updates" from Sameer Pujar <spujar@nvidia.com>: (diff) | |
| download | linux-b8161cbe55a1892a19a318eaebbda92438fa708c.tar.xz linux-b8161cbe55a1892a19a318eaebbda92438fa708c.zip | |
ASoC: wm8994: 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: 57e265c8d71fb ("ASoC: wm8994: Move runtime PM init to platform device init")
Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Reviewed-by: Richard Fitzgerald <rf@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20201111041326.1257558-2-zhangqilong3@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index fc9ea198ac79..f57884113406 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -4645,8 +4645,12 @@ static int wm8994_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); pm_runtime_idle(&pdev->dev); - return devm_snd_soc_register_component(&pdev->dev, &soc_component_dev_wm8994, + ret = devm_snd_soc_register_component(&pdev->dev, &soc_component_dev_wm8994, wm8994_dai, ARRAY_SIZE(wm8994_dai)); + if (ret < 0) + pm_runtime_disable(&pdev->dev); + + return ret; } static int wm8994_remove(struct platform_device *pdev) |