redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt 

[ Upstream commit c4c59b95b7 ]

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>
5.4-rM2-2.2.x-imx-squashed
Qiushi Wu 2020-06-13 22:37:48 -05:00 committed by Greg Kroah-Hartman
parent a53f67368c
commit 8150a0e3d7
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/img/img-i2s-in.c
View File

@ -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);