Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/msm/msm_drv.c

+2 −7
Original line number Diff line number Diff line
@@ -911,10 +911,8 @@ static int add_components_mdp(struct device *mdp_dev, 
		 * remote-endpoint isn't a component that we need to add

		 */

		if (of_device_is_compatible(np, "qcom,mdp4") &&

		    ep.port == 0) {

			of_node_put(ep_node);

		    ep.port == 0)

			continue;

		}



		/*

		 * 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, 
		 * any external interface.

		 */

		intf = of_graph_get_remote_port_parent(ep_node);

		if (!intf) {

			of_node_put(ep_node);

		if (!intf)

			continue;

		}



		drm_of_component_match_add(master_dev, matchptr, compare_of,

					   intf);

		of_node_put(intf);

		of_node_put(ep_node);

	}



	return 0;