Skip to content

Commit

Permalink
ASoC: img-parallel-out: Fix a reference count leak
Browse files Browse the repository at this point in the history
[ Upstream commit 6b9fbb0 ]

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code, causing incorrect ref count if
pm_runtime_put_noidle() is not called in error handling paths.
Thus call pm_runtime_put_noidle() if pm_runtime_get_sync() fails.

Signed-off-by: Qiushi Wu <wu000273@umn.edu>
Link: https://lore.kernel.org/r/20200614033344.1814-1-wu000273@umn.edu
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
QiushiWu authored and gregkh committed Sep 3, 2020
1 parent c340a3b commit d5581a8
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sound/soc/img/img-parallel-out.c
Expand Up @@ -163,8 +163,10 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
}

ret = pm_runtime_get_sync(prl->dev);
if (ret < 0)
if (ret < 0) {
pm_runtime_put_noidle(prl->dev);
return ret;
}

reg = img_prl_out_readl(prl, IMG_PRL_OUT_CTL);
reg = (reg & ~IMG_PRL_OUT_CTL_EDGE_MASK) | control_set;
Expand Down

0 comments on commit d5581a8

Please sign in to comment.