Skip to content

Commit

Permalink
ethernet: arc: emac_main: add missing of_node_put after calling of_pa…
Browse files Browse the repository at this point in the history
…rse_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: Peter Chen <peter.chen@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Peter Chen authored and David S. Miller committed Aug 2, 2016
1 parent 9c52de0 commit a94efbd
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions drivers/net/ethernet/arc/emac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand All @@ -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;
}
}

Expand Down Expand Up @@ -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:
Expand All @@ -877,6 +881,9 @@ int arc_emac_probe(struct net_device *ndev, int interface)
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);
Expand Down

0 comments on commit a94efbd

Please sign in to comment.