Skip to content

Commit

Permalink
ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt
Browse files Browse the repository at this point in the history
[ Upstream commit c4c59b9 ]

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/20200614033749.2975-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 7d60c77 commit c340a3b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion sound/soc/img/img-i2s-in.c
Expand Up @@ -343,8 +343,10 @@ static int img_i2s_in_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
chan_control_mask = IMG_I2S_IN_CH_CTL_CLK_TRANS_MASK;

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

for (i = 0; i < i2s->active_channels; i++)
img_i2s_in_ch_disable(i2s, i);
Expand Down

0 comments on commit c340a3b

Please sign in to comment.