]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ASoC: img: Fix a reference count leak in img_i2s_in_set_fmt
authorQiushi Wu <wu000273@umn.edu>
Sun, 14 Jun 2020 03:37:48 +0000 (22:37 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Sep 2020 09:26:41 +0000 (11:26 +0200)
[ Upstream commit c4c59b95b7f7d4cef5071b151be2dadb33f3287b ]

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>
sound/soc/img/img-i2s-in.c

index 869fe0068cbd3723b03b061c6cc2ca136d30e14e..bb668551dd4b2060eb4dd5f68fbc1f31159af9a0 100644 (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);