drm/sun4i: Fix releasing node when enumerating enpoints

[ Upstream commit 367c359aa8637b15ee8df6335c5a29b7623966ec ]

sun4i_drv_add_endpoints() has a memory leak since it uses of_node_put()
when remote is equal to NULL and does nothing when remote has a valid
pointer.

Invert the logic to fix memory leak.

Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180625120304.7543-7-jernej.skrabec@siol.net
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
index ace59651892fb636400088e2ac9136a0917d45dd..8d3c8070ed86238206f208f22cb84a10d90922cf 100644 (file)
--- a/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@ -241,7 +241,6 @@ static int sun4i_drv_add_endpoints(struct device *dev,
                remote = of_graph_get_remote_port_parent(ep);
                if (!remote) {
                        DRM_DEBUG_DRIVER("Error retrieving the output node\n");
-                       of_node_put(remote);
                        continue;
                }
 
@@ -255,11 +254,13 @@ static int sun4i_drv_add_endpoints(struct device *dev,
 
                        if (of_graph_parse_endpoint(ep, &endpoint)) {
                                DRM_DEBUG_DRIVER("Couldn't parse endpoint\n");
+                               of_node_put(remote);
                                continue;
                        }
 
                        if (!endpoint.id) {
                                DRM_DEBUG_DRIVER("Endpoint is our panel... skipping\n");
+                               of_node_put(remote);
                                continue;
                        }
                }