openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: exynos4-is: Fix several reference count leaks due to pm_runtime_get_sync 

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>
This commit is contained in:
Qiushi Wu 2020-06-14 05:18:29 +02:00 committed by Mauro Carvalho Chehab
parent c47f7c779e
commit 7ef64ceea0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/platform/exynos4-is/fimc-isp.c
View File

@ -305,8 +305,10 @@ static int fimc_isp_subdev_s_power(struct v4l2_subdev *sd, int on)
if (on) { if (on) {
ret = pm_runtime_get_sync(&is->pdev->dev); ret = pm_runtime_get_sync(&is->pdev->dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put(&is->pdev->dev);
return ret; return ret;
}
set_bit(IS_ST_PWR_ON, &is->state); set_bit(IS_ST_PWR_ON, &is->state);
ret = fimc_is_start_firmware(is); ret = fimc_is_start_firmware(is);

2
drivers/media/platform/exynos4-is/fimc-lite.c
View File

@ -471,7 +471,7 @@ static int fimc_lite_open(struct file *file)
set_bit(ST_FLITE_IN_USE, &fimc->state); set_bit(ST_FLITE_IN_USE, &fimc->state);
ret = pm_runtime_get_sync(&fimc->pdev->dev); ret = pm_runtime_get_sync(&fimc->pdev->dev);
if (ret < 0) if (ret < 0)
goto unlock; goto err_pm;
ret = v4l2_fh_open(file); ret = v4l2_fh_open(file);
if (ret < 0) if (ret < 0)