Commit 98fae901 authored by Dinghao Liu's avatar Dinghao Liu Committed by Mauro Carvalho Chehab

media: vsp1: Fix runtime PM imbalance on error

pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.
Signed-off-by: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent b4630215
...@@ -562,7 +562,12 @@ int vsp1_device_get(struct vsp1_device *vsp1) ...@@ -562,7 +562,12 @@ int vsp1_device_get(struct vsp1_device *vsp1)
int ret; int ret;
ret = pm_runtime_get_sync(vsp1->dev); ret = pm_runtime_get_sync(vsp1->dev);
return ret < 0 ? ret : 0; if (ret < 0) {
pm_runtime_put_noidle(vsp1->dev);
return ret;
}
return 0;
} }
/* /*
...@@ -845,12 +850,12 @@ static int vsp1_probe(struct platform_device *pdev) ...@@ -845,12 +850,12 @@ static int vsp1_probe(struct platform_device *pdev)
/* Configure device parameters based on the version register. */ /* Configure device parameters based on the version register. */
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
ret = pm_runtime_get_sync(&pdev->dev); ret = vsp1_device_get(vsp1);
if (ret < 0) if (ret < 0)
goto done; goto done;
vsp1->version = vsp1_read(vsp1, VI6_IP_VERSION); vsp1->version = vsp1_read(vsp1, VI6_IP_VERSION);
pm_runtime_put_sync(&pdev->dev); vsp1_device_put(vsp1);
for (i = 0; i < ARRAY_SIZE(vsp1_device_infos); ++i) { for (i = 0; i < ARRAY_SIZE(vsp1_device_infos); ++i) {
if ((vsp1->version & VI6_IP_VERSION_MODEL_MASK) == if ((vsp1->version & VI6_IP_VERSION_MODEL_MASK) ==
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment