media: vsp1: Fix runtime PM imbalance on error

[ Upstream commit 98fae901c8883640202802174a4bd70a1b9118bd ]

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: Dinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index eed9516e25e1d59fa89f10d89f2301f601d4a27a..5836fb298de271d9867f9310f10549945b088df7 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -549,7 +549,12 @@ int vsp1_device_get(struct vsp1_device *vsp1)
        int ret;
 
        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;
 }
 
 /*
@@ -829,12 +834,12 @@ static int vsp1_probe(struct platform_device *pdev)
        /* Configure device parameters based on the version register. */
        pm_runtime_enable(&pdev->dev);
 
-       ret = pm_runtime_get_sync(&pdev->dev);
+       ret = vsp1_device_get(vsp1);
        if (ret < 0)
                goto done;
 
        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) {
                if ((vsp1->version & VI6_IP_VERSION_MODEL_MASK) ==