xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: sh_vou: fix pm_runtime_get_sync() usage count

Browse Source 
[ Upstream commit 6e8b1526db164c9d4b9dacfb9bc48e365d7c4860 ]

The pm_runtime_get_sync() internally increments the
dev->power.usage_count without decrementing it, even on errors.
Replace it by the new pm_runtime_resume_and_get(), introduced by:
commit dd8088d5a8 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
in order to properly decrement the usage counter, avoiding
a potential PM usage counter leak.

While here, check if the PM runtime error was caught at open time.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mauro Carvalho Chehab
2021-04-23 17:07:41 +02:00
committed by Greg Kroah-Hartman
parent 64e291d697
commit 8318f7bc0e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/sh_vou.c
View File

@@ -1133,7 +1133,11 @@ static int sh_vou_open(struct file *file)
if (v4l2_fh_is_singular_file(file) && if (v4l2_fh_is_singular_file(file) &&
vou_dev->status == SH_VOU_INITIALISING) { vou_dev->status == SH_VOU_INITIALISING) {
/* First open */ /* First open */
pm_runtime_get_sync(vou_dev->v4l2_dev.dev); err = pm_runtime_resume_and_get(vou_dev->v4l2_dev.dev);
if (err < 0) {
v4l2_fh_release(file);
goto done_open;
}
err = sh_vou_hw_init(vou_dev); err = sh_vou_hw_init(vou_dev);
if (err < 0) { if (err < 0) {
pm_runtime_put(vou_dev->v4l2_dev.dev); pm_runtime_put(vou_dev->v4l2_dev.dev);