drm: rcar-du: Fix memory leak in rcar_du_vsps_init()

[ Upstream commit 91e3bf09a90bb4340c0c3c51396e7531555efda4 ]

The rcar_du_vsps_init() doesn't free the np allocated by
of_parse_phandle_with_fixed_args() for the non-error case.

Fix memory leak for the non-error case.

While at it, replace the label 'error'->'done' as it applies to non-error
case as well and update the error check condition for rcar_du_vsp_init()
to avoid breakage in future, if it returns positive value.

Fixes: 3e81374e2014 ("drm: rcar-du: Support multiple sources from the same VSP")
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Link: https://lore.kernel.org/r/20231116122424.80136-1-biju.das.jz@bp.renesas.com
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@ideasonboard.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index 7015e22872bbe283d4eb0ecbb78ef50fd5553c12..41b4a6715dad5bafcfc53bc5f7e9e0560a194dfc 100644 (file)
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -626,7 +626,7 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
                ret = of_parse_phandle_with_fixed_args(np, vsps_prop_name,
                                                       cells, i, &args);
                if (ret < 0)
-                       goto error;
+                       goto done;
 
                /*
                 * Add the VSP to the list or update the corresponding existing
@@ -664,13 +664,11 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
                vsp->dev = rcdu;
 
                ret = rcar_du_vsp_init(vsp, vsps[i].np, vsps[i].crtcs_mask);
-               if (ret < 0)
-                       goto error;
+               if (ret)
+                       goto done;
        }
 
-       return 0;
-
-error:
+done:
        for (i = 0; i < ARRAY_SIZE(vsps); ++i)
                of_node_put(vsps[i].np);