summary refs log tree commit diff
path: root/drivers/media
diff options
context:
space:
mode:
authorQiushi Wu <wu000273@umn.edu>2020-06-14 04:31:22 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-09-27 10:53:29 +0200
commit78741ce98c2e36188e2343434406b0e0bc50b0e7 (patch)
tree021fb18029accc463b7a0823da105d0a92170257 /drivers/media
parentd0675b67b42eb4f1a840d1513b5b00f78312f833 (diff)
downloadlinux-78741ce98c2e36188e2343434406b0e0bc50b0e7.tar.gz
media: s5p-mfc: Fix a reference count leak
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.

Fixes: c5086f130a77 ("[media] s5p-mfc: Use clock gating only on MFC v5 hardware")
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_pm.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
index 7d52431c2c83..62d2320a7218 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_pm.c
@@ -79,8 +79,10 @@ int s5p_mfc_power_on(void)
 	int i, ret = 0;
 
 	ret = pm_runtime_get_sync(pm->device);
-	if (ret < 0)
+	if (ret < 0) {
+		pm_runtime_put_noidle(pm->device);
 		return ret;
+	}
 
 	/* clock control */
 	for (i = 0; i < pm->num_clocks; i++) {