Commit a94efbd7 authored by Peter Chen's avatar Peter Chen Committed by David S. Miller
Browse files

ethernet: arc: emac_main: add missing of_node_put after calling of_parse_phandle 



of_node_put needs to be called when the device node which is got
from of_parse_phandle has finished using.

Signed-off-by: default avatarPeter Chen <peter.chen@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c52de03

drivers/net/ethernet/arc/emac_main.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -749,14 +749,16 @@ int arc_emac_probe(struct net_device *ndev, int interface) 
	err = of_address_to_resource(dev->of_node, 0, &res_regs);

	err = of_address_to_resource(dev->of_node, 0, &res_regs);

	if (err) {

	if (err) {

		dev_err(dev, "failed to retrieve registers base from device tree\n");

		dev_err(dev, "failed to retrieve registers base from device tree\n");

		return -ENODEV;

		err = -ENODEV;

		goto out_put_node;

	}

	}





	/* Get IRQ from device tree */

	/* Get IRQ from device tree */

	irq = irq_of_parse_and_map(dev->of_node, 0);

	irq = irq_of_parse_and_map(dev->of_node, 0);

	if (!irq) {

	if (!irq) {

		dev_err(dev, "failed to retrieve <irq> value from device tree\n");

		dev_err(dev, "failed to retrieve <irq> value from device tree\n");

		return -ENODEV;

		err = -ENODEV;

		goto out_put_node;

	}

	}





	ndev->netdev_ops = &arc_emac_netdev_ops;

	ndev->netdev_ops = &arc_emac_netdev_ops;
@@ -778,7 +780,7 @@ int arc_emac_probe(struct net_device *ndev, int interface) 
		err = clk_prepare_enable(priv->clk);

		err = clk_prepare_enable(priv->clk);

		if (err) {

		if (err) {

			dev_err(dev, "failed to enable clock\n");

			dev_err(dev, "failed to enable clock\n");

			return err;

			goto out_put_node;

		}

		}





		clock_frequency = clk_get_rate(priv->clk);

		clock_frequency = clk_get_rate(priv->clk);
@@ -787,7 +789,8 @@ int arc_emac_probe(struct net_device *ndev, int interface) 
		if (of_property_read_u32(dev->of_node, "clock-frequency",

		if (of_property_read_u32(dev->of_node, "clock-frequency",

					 &clock_frequency)) {

					 &clock_frequency)) {

			dev_err(dev, "failed to retrieve <clock-frequency> from device tree\n");

			dev_err(dev, "failed to retrieve <clock-frequency> from device tree\n");

			return -EINVAL;

			err = -EINVAL;

			goto out_put_node;

		}

		}

	}

	}
@@ -867,6 +870,7 @@ int arc_emac_probe(struct net_device *ndev, int interface) 
		goto out_netif_api;

		goto out_netif_api;

	}

	}





	of_node_put(phy_node);

	return 0;

	return 0;





out_netif_api:

out_netif_api:
@@ -877,6 +881,9 @@ int arc_emac_probe(struct net_device *ndev, int interface) 
out_clken:

out_clken:

	if (priv->clk)

	if (priv->clk)

		clk_disable_unprepare(priv->clk);

		clk_disable_unprepare(priv->clk);

out_put_node:

	of_node_put(phy_node);



	return err;

	return err;

}

}

EXPORT_SYMBOL_GPL(arc_emac_probe);

EXPORT_SYMBOL_GPL(arc_emac_probe);