Skip to content

Commit

Permalink
ASoC: wm8994: Fix PM disable depth imbalance on error
Browse files Browse the repository at this point in the history
[ Upstream commit b8161cb ]

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: 57e265c ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Zhang Qilong authored and gregkh committed Dec 30, 2020
1 parent 8f48a20 commit 351d001
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion sound/soc/codecs/wm8994.c
Expand Up @@ -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)
Expand Down

0 comments on commit 351d001

Please sign in to comment.