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

Commit bd252796 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

net: netcp: add missing of_node_put 

for_each_child_of_node performs an of_node_get on each iteration, so
a break out of the loop requires an of_node_put.

A simplified version of the semantic patch that fixes this problem is as
follows (http://coccinelle.lip6.fr

):

// <smpl>
@@
local idexpression r.n;
expression r,e;
@@

 for_each_child_of_node(r,n) {
   ...
(
   of_node_put(n);
|
   e = n
|
+  of_node_put(n);
?  break;
)
   ...
 }
... when != n
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8c387ebb

drivers/net/ethernet/ti/netcp_ethss.c

+6 −2
Original line number Diff line number Diff line
@@ -2637,9 +2637,11 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev, 
			mac_phy_link = true;



		slave->open = true;

		if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves)

		if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves) {

			of_node_put(port);

			break;

		}

	}



	/* of_phy_connect() is needed only for MAC-PHY interface */

	if (!mac_phy_link)
@@ -3137,9 +3139,11 @@ static int gbe_probe(struct netcp_device *netcp_device, struct device *dev, 
			continue;

		}

		gbe_dev->num_slaves++;

		if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves)

		if (gbe_dev->num_slaves >= gbe_dev->max_num_slaves) {

			of_node_put(interface);

			break;

		}

	}

	of_node_put(interfaces);



	if (!gbe_dev->num_slaves)