Commit 49b9f431 authored by Liang He's avatar Liang He Committed by David S. Miller

net: ftgmac100: Hold reference returned by of_get_child_by_name()

In ftgmac100_probe(), we should hold the refernece returned by
of_get_child_by_name() and use it to call of_node_put() for
reference balance.

Fixes: 39bfab88 ("net: ftgmac100: Add support for DT phy-handle property")
Signed-off-by: default avatarLiang He <windhl@126.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7d5424b2
...@@ -1764,6 +1764,19 @@ static int ftgmac100_setup_clk(struct ftgmac100 *priv) ...@@ -1764,6 +1764,19 @@ static int ftgmac100_setup_clk(struct ftgmac100 *priv)
return rc; return rc;
} }
static bool ftgmac100_has_child_node(struct device_node *np, const char *name)
{
struct device_node *child_np = of_get_child_by_name(np, name);
bool ret = false;
if (child_np) {
ret = true;
of_node_put(child_np);
}
return ret;
}
static int ftgmac100_probe(struct platform_device *pdev) static int ftgmac100_probe(struct platform_device *pdev)
{ {
struct resource *res; struct resource *res;
...@@ -1883,7 +1896,7 @@ static int ftgmac100_probe(struct platform_device *pdev) ...@@ -1883,7 +1896,7 @@ static int ftgmac100_probe(struct platform_device *pdev)
/* Display what we found */ /* Display what we found */
phy_attached_info(phy); phy_attached_info(phy);
} else if (np && !of_get_child_by_name(np, "mdio")) { } else if (np && !ftgmac100_has_child_node(np, "mdio")) {
/* Support legacy ASPEED devicetree descriptions that decribe a /* Support legacy ASPEED devicetree descriptions that decribe a
* MAC with an embedded MDIO controller but have no "mdio" * MAC with an embedded MDIO controller but have no "mdio"
* child node. Automatically scan the MDIO bus for available * child node. Automatically scan the MDIO bus for available
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment