]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
media: st-delta: Fix PM disable depth imbalance in delta_probe
authorMiaoqian Lin <linmq006@gmail.com>
Mon, 7 Mar 2022 08:08:59 +0000 (09:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jun 2022 08:21:08 +0000 (10:21 +0200)
[ Upstream commit 94e3dba710fe0afc772172305444250023fc2d30 ]

The pm_runtime_enable will decrease power disable depth.
If the probe fails, we should use pm_runtime_disable() to balance
pm_runtime_enable().

Fixes: f386509e4959 ("[media] st-delta: STiH4xx multi-format video decoder v4l2 driver")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Acked-by: Hugues Fruchet <hugues.fruchet@foss.st.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/media/platform/sti/delta/delta-v4l2.c

index c691b3d81549d408a5b96ed41e7a53b45fe9a8c1..5da49a0ab70b9f419f8cca2fbed95d15a799be8b 100644 (file)
@@ -1862,7 +1862,7 @@ static int delta_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(delta->dev, "%s failed to initialize firmware ipc channel\n",
                        DELTA_PREFIX);
-               goto err;
+               goto err_pm_disable;
        }
 
        /* register all available decoders */
@@ -1876,7 +1876,7 @@ static int delta_probe(struct platform_device *pdev)
        if (ret) {
                dev_err(delta->dev, "%s failed to register V4L2 device\n",
                        DELTA_PREFIX);
-               goto err;
+               goto err_pm_disable;
        }
 
        delta->work_queue = create_workqueue(DELTA_NAME);
@@ -1901,6 +1901,8 @@ err_work_queue:
        destroy_workqueue(delta->work_queue);
 err_v4l2:
        v4l2_device_unregister(&delta->v4l2_dev);
+err_pm_disable:
+       pm_runtime_disable(dev);
 err:
        return ret;
 }