]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Revert "gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_pha...
authorPeter Chen <peter.chen@nxp.com>
Thu, 11 Aug 2016 09:44:54 +0000 (17:44 +0800)
committerSean Paul <seanpaul@chromium.org>
Fri, 12 Aug 2016 11:10:37 +0000 (07:10 -0400)
This reverts
commit 2ab9f5879162499e1c4e48613287e3f59e593c4f
Author: Peter Chen <peter.chen@nxp.com>
Date:   Fri Jul 15 11:17:03 2016 +0800
    gpu: drm: omapdrm: dss-of: add missing of_node_put after calling of_parse_phandle

The of_get_next_parent will drop refcount on the passed node, so the reverted
patch is wrong, thanks for Tomi Valkeinen points it.

Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Peter Chen <peter.chen@nxp.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: http://patchwork.freedesktop.org/patch/msgid/1470908694-16362-1-git-send-email-peter.chen@nxp.com
drivers/gpu/drm/omapdrm/dss/dss-of.c

index e256d879b25ccc379cf93201b155f31e00269af2..dfd4e9621e3b1c969b76ac6873a480a163d98959 100644 (file)
@@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
 
 static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
 {
-       struct device_node *np, *np_parent;
+       struct device_node *np;
 
        np = of_parse_phandle(node, "remote-endpoint", 0);
        if (!np)
                return NULL;
 
-       np_parent = of_get_next_parent(np);
-       of_node_put(np);
+       np = of_get_next_parent(np);
 
-       return np_parent;
+       return np;
 }
 
 struct device_node *