]> git.baikalelectronics.ru Git - kernel.git/commitdiff
media: atmel: atmel-isc: Fix PM disable depth imbalance in atmel_isc_probe
authorMiaoqian Lin <linmq006@gmail.com>
Mon, 7 Mar 2022 08:16:37 +0000 (09:16 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 13 May 2022 09:02:17 +0000 (11:02 +0200)
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: 1f6980f12575 ("media: atmel: atmel-isc: split driver into driver base and isc")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/platform/atmel/atmel-sama5d2-isc.c

index c5b9563e36cb110434ce9e0aa0ae9a5bf9c2a0f2..e9415495e738d0b49b7d2f9dc11c85746fddb855 100644 (file)
@@ -562,7 +562,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
        ret = clk_prepare_enable(isc->ispck);
        if (ret) {
                dev_err(dev, "failed to enable ispck: %d\n", ret);
-               goto cleanup_subdev;
+               goto disable_pm;
        }
 
        /* ispck should be greater or equal to hclock */
@@ -580,6 +580,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
 unprepare_clk:
        clk_disable_unprepare(isc->ispck);
 
+disable_pm:
+       pm_runtime_disable(dev);
+
 cleanup_subdev:
        isc_subdev_cleanup(isc);