summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorQiushi Wu <wu000273@umn.edu>2020-06-14 06:01:11 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-10-29 12:08:18 +0300
commit2341407a05eae93412c8fe5ab8a4eb0833f64771 (patch)
treeba657d9d7d2a522673c7b91e6c964837bb5714d4 /drivers/media
parentdcc6fbbab0dc62bb3cdac9b81a089bab4c2ef029 (diff)
downloadlinux-2341407a05eae93412c8fe5ab8a4eb0833f64771.tar.xz
media: exynos4-is: Fix a reference count leak
[ Upstream commit 64157b2cb1940449e7df2670e85781c690266588 ] 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> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/exynos4-is/mipi-csis.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index 540151bbf58f..1aac167abb17 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -510,8 +510,10 @@ static int s5pcsis_s_stream(struct v4l2_subdev *sd, int enable)
if (enable) {
s5pcsis_clear_counters(state);
ret = pm_runtime_get_sync(&state->pdev->dev);
- if (ret && ret != 1)
+ if (ret && ret != 1) {
+ pm_runtime_put_noidle(&state->pdev->dev);
return ret;
+ }
}
mutex_lock(&state->lock);