ethernet: arc: emac_main: add missing of_node_put after calling of_parse_phandle
authorPeter Chen <peter.chen@nxp.com>
Mon, 1 Aug 2016 07:02:31 +0000 (15:02 +0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Aug 2016 04:43:47 +0000 (21:43 -0700)
of_node_put needs to be called when the device node which is got
from of_parse_phandle has finished using.

Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/arc/emac_main.c

index 586bedac457d266a0a82eb2c2f61c8961e247ec2..4bff0f3040df7a85bae40278e13b655009ba1a49 100644 (file)
@@ -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);
        if (err) {
                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 */
        irq = irq_of_parse_and_map(dev->of_node, 0);
        if (!irq) {
                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;
@@ -778,7 +780,7 @@ int arc_emac_probe(struct net_device *ndev, int interface)
                err = clk_prepare_enable(priv->clk);
                if (err) {
                        dev_err(dev, "failed to enable clock\n");
-                       return err;
+                       goto out_put_node;
                }
 
                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",
                                         &clock_frequency)) {
                        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;
        }
 
+       of_node_put(phy_node);
        return 0;
 
 out_netif_api:
@@ -877,6 +881,9 @@ out_mdio:
 out_clken:
        if (priv->clk)
                clk_disable_unprepare(priv->clk);
+out_put_node:
+       of_node_put(phy_node);
+
        return err;
 }
 EXPORT_SYMBOL_GPL(arc_emac_probe);