aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFugang Duan <fugang.duan@nxp.com>2018-01-03 21:47:20 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-05 11:19:11 -0500
commitd1616f07e8f1a4a490d1791316d4a68906b284aa (patch)
tree014c629a46f8cdf4cd4a8fbd702fd56494d3efc6
parentf737be8d61f251d2c1632f871ba824aa5a512384 (diff)
net: fec: free/restore resource in related probe error pathes
Fixes in probe error path: - Restore dev_id before failed_ioremap path. Fixes: ("net: fec: restore dev_id in the cases of probe error") - Call of_node_put(phy_node) before failed_phy path. Fixes: ("net: fec: Support phys probed from devicetree and fixed-link") Signed-off-by: Fugang Duan <fugang.duan@nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 19f198e22e15..a74300a4459c 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3556,11 +3556,11 @@ failed_clk_ipg:
3556failed_clk: 3556failed_clk:
3557 if (of_phy_is_fixed_link(np)) 3557 if (of_phy_is_fixed_link(np))
3558 of_phy_deregister_fixed_link(np); 3558 of_phy_deregister_fixed_link(np);
3559failed_phy:
3560 of_node_put(phy_node); 3559 of_node_put(phy_node);
3560failed_phy:
3561 dev_id--;
3561failed_ioremap: 3562failed_ioremap:
3562 free_netdev(ndev); 3563 free_netdev(ndev);
3563 dev_id--;
3564 3564
3565 return ret; 3565 return ret;
3566} 3566}