Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03d23445 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files

media: rcar_fdp1: fix pm_runtime_get_sync() usage count 



[ Upstream commit 45e75a8c6fa455a5909ac04db76a4b15d6bb8368 ]

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 dd8088d5a896 ("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.

Also, right now, the driver is ignoring any troubles when
trying to do PM resume. So, add the proper error handling
for the code.

Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: c766c90faf93 ("media: rcar_fdp1: Fix refcount leak in probe and remove function")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent aebe8e43

drivers/media/platform/rcar_fdp1.c

+11 −2
Original line number Diff line number Diff line
@@ -2139,7 +2139,9 @@ static int fdp1_open(struct file *file) 
	}



	/* Perform any power management required */

	pm_runtime_get_sync(fdp1->dev);

	ret = pm_runtime_resume_and_get(fdp1->dev);

	if (ret < 0)

		goto error_pm;



	v4l2_fh_add(&ctx->fh);
@@ -2149,6 +2151,8 @@ static int fdp1_open(struct file *file) 
	mutex_unlock(&fdp1->dev_mutex);

	return 0;



error_pm:

       v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);

error_ctx:

	v4l2_ctrl_handler_free(&ctx->hdl);

	kfree(ctx);
@@ -2356,7 +2360,9 @@ static int fdp1_probe(struct platform_device *pdev) 


	/* Power up the cells to read HW */

	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(fdp1->dev);

	ret = pm_runtime_resume_and_get(fdp1->dev);

	if (ret < 0)

		goto disable_pm;



	hw_version = fdp1_read(fdp1, FD1_IP_INTDATA);

	switch (hw_version) {
@@ -2385,6 +2391,9 @@ static int fdp1_probe(struct platform_device *pdev) 


	return 0;



disable_pm:

	pm_runtime_disable(fdp1->dev);



release_m2m:

	v4l2_m2m_release(fdp1->m2m_dev);