summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQiushi Wu <wu000273@umn.edu>2020-06-13 22:33:43 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-09-03 11:29:14 +0200
commitd5581a8e323cb3daef929d5d4ffa380f1f395c77 (patch)
treee9d1b2d2d1bfeb18f070630953df3aa948cee4ae
parentc340a3b9da14cb1632ca86365cf904c4b6320e5a (diff)
downloadlinux-stable-d5581a8e323cb3daef929d5d4ffa380f1f395c77.tar.gz
linux-stable-d5581a8e323cb3daef929d5d4ffa380f1f395c77.tar.bz2
linux-stable-d5581a8e323cb3daef929d5d4ffa380f1f395c77.zip
ASoC: img-parallel-out: Fix a reference count leak
[ Upstream commit 6b9fbb073636906eee9fe4d4c05a4f445b9e2a23 ] 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>
-rw-r--r--sound/soc/img/img-parallel-out.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c
index 5ddbe3a31c2e..4da49a42e854 100644
--- a/sound/soc/img/img-parallel-out.c
+++ b/sound/soc/img/img-parallel-out.c
@@ -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;