aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorDinghao Liu <dinghao.liu@zju.edu.cn>2020-05-25 15:02:06 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-09-27 10:51:14 +0200
commitb4630215067a411341ceeb7850b95b341eee6511 (patch)
treee289b2947d7daa080e68d92369211770a4ac8b77 /drivers/media
parentmedia: platform: s3c-camif: Fix runtime PM imbalance on error (diff)
downloadlinux-dev-b4630215067a411341ceeb7850b95b341eee6511.tar.xz
linux-dev-b4630215067a411341ceeb7850b95b341eee6511.zip
media: coda: Fix runtime PM imbalance in coda_probe
When coda_firmware_request() returns an error code, a pairing runtime PM usage counter decrement is needed to keep the counter balanced. Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn> 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/coda/coda-common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index eeba6c060981..87a2c706f747 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -3264,6 +3264,8 @@ static int coda_probe(struct platform_device *pdev)
return 0;
err_alloc_workqueue:
+ pm_runtime_disable(&pdev->dev);
+ pm_runtime_put_noidle(&pdev->dev);
destroy_workqueue(dev->workqueue);
err_v4l2_register:
v4l2_device_unregister(&dev->v4l2_dev);