]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: exynos4-is: Fix a reference count leak
authorQiushi Wu <wu000273@umn.edu>
Sun, 14 Jun 2020 03:01:11 +0000 (05:01 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 08:07:15 +0000 (09:07 +0100)
[ 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>
drivers/media/platform/exynos4-is/mipi-csis.c

index 560aadabcb111c3de8aac551c1e4809f741de245..040d10df17c974310e48ad5518ed12dbf7ffb4c9 100644 (file)
@@ -513,8 +513,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);