OSDN Git Service

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)
committerMark Brown <broonie@kernel.org>
Mon, 15 Jun 2020 19:58:34 +0000 (20:58 +0100)
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>
sound/soc/img/img-i2s-in.c

index e30b66b..0843235 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);