Commit d8dd8052 authored by Archit Taneja's avatar Archit Taneja Committed by Rob Clark

drm/msm: Remove bad calls to of_node_put()

In add_components_mdp, we parse the endpoints in MDP output ports
using the helper for_each_endpoint_of_node(). Our function calls
of_node_put() on the endpoint node before we iterate over the
next one. This is already done by the helper, and results in
trying to decrement the refcount twice.

Remove the extra of_node_put calls. This fixes warnings seen when
we try to insert the driver as a module on IFC6410.
Reported-by: default avatarIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: default avatarArchit Taneja <architt@codeaurora.org>
Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
parent 9708ebbe
...@@ -911,10 +911,8 @@ static int add_components_mdp(struct device *mdp_dev, ...@@ -911,10 +911,8 @@ static int add_components_mdp(struct device *mdp_dev,
* remote-endpoint isn't a component that we need to add * remote-endpoint isn't a component that we need to add
*/ */
if (of_device_is_compatible(np, "qcom,mdp4") && if (of_device_is_compatible(np, "qcom,mdp4") &&
ep.port == 0) { ep.port == 0)
of_node_put(ep_node);
continue; continue;
}
/* /*
* It's okay if some of the ports don't have a remote endpoint * It's okay if some of the ports don't have a remote endpoint
...@@ -922,15 +920,12 @@ static int add_components_mdp(struct device *mdp_dev, ...@@ -922,15 +920,12 @@ static int add_components_mdp(struct device *mdp_dev,
* any external interface. * any external interface.
*/ */
intf = of_graph_get_remote_port_parent(ep_node); intf = of_graph_get_remote_port_parent(ep_node);
if (!intf) { if (!intf)
of_node_put(ep_node);
continue; continue;
}
drm_of_component_match_add(master_dev, matchptr, compare_of, drm_of_component_match_add(master_dev, matchptr, compare_of,
intf); intf);
of_node_put(intf); of_node_put(intf);
of_node_put(ep_node);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment