[PATCH 04/55] media: rkisp1: Disable runtime PM in probe error path

[Dafna Hirschfeld]

On 15.06.2022 04:10, Paul Elder wrote:
>From: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
>
>If the v4l2_device_register() call fails, runtime PM is left enabled.
>Fix it.
>
>Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Reviewed-by: Dafna Hirschfeld <dafna at fastmail.com>

>---
> drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>index 97d569968285..248f0172ca62 100644
>--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
>@@ -523,7 +523,7 @@ static int rkisp1_probe(struct platform_device *pdev)
>
> 	ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev);
> 	if (ret)
>-		return ret;
>+		goto err_pm_runtime_disable;
>
> 	ret = media_device_register(&rkisp1->media_dev);
> 	if (ret) {
>@@ -543,6 +543,7 @@ static int rkisp1_probe(struct platform_device *pdev)
> 	media_device_unregister(&rkisp1->media_dev);
> err_unreg_v4l2_dev:
> 	v4l2_device_unregister(&rkisp1->v4l2_dev);
>+err_pm_runtime_disable:
> 	pm_runtime_disable(&pdev->dev);
> 	return ret;
> }
>-- 
>2.30.2
>