Skip to content

Commit

Permalink
media: exynos4-is: Fix several reference count leaks due to pm_runtim…
Browse files Browse the repository at this point in the history
…e_get_sync

[ Upstream commit 7ef64ce ]

On calling pm_runtime_get_sync() the reference count of the device
is incremented. In case of failure, decrement the
reference count before returning the error.

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>
  • Loading branch information
QiushiWu authored and gregkh committed Oct 29, 2020
1 parent 3ee4cae commit 49cb98d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion drivers/media/platform/exynos4-is/fimc-isp.c
Expand Up @@ -305,8 +305,10 @@ static int fimc_isp_subdev_s_power(struct v4l2_subdev *sd, int on)

if (on) {
ret = pm_runtime_get_sync(&is->pdev->dev);
if (ret < 0)
if (ret < 0) {
pm_runtime_put(&is->pdev->dev);
return ret;
}
set_bit(IS_ST_PWR_ON, &is->state);

ret = fimc_is_start_firmware(is);
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/exynos4-is/fimc-lite.c
Expand Up @@ -471,7 +471,7 @@ static int fimc_lite_open(struct file *file)
set_bit(ST_FLITE_IN_USE, &fimc->state);
ret = pm_runtime_get_sync(&fimc->pdev->dev);
if (ret < 0)
goto unlock;
goto err_pm;

ret = v4l2_fh_open(file);
if (ret < 0)
Expand Down

0 comments on commit 49cb98d

Please sign in to comment.