Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66ee6a06 authored by Michael Grzeschik's avatar Michael Grzeschik Committed by David S. Miller
Browse files

net: macb: add of_node_put to error paths 



We add the call of_node_put(bp->phy_node) to all associated error
paths for memory clean up.

Signed-off-by: default avatarMichael Grzeschik <m.grzeschik@pengutronix.de>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9ce98140

drivers/net/ethernet/cadence/macb_main.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -611,6 +611,7 @@ static int macb_mii_init(struct macb *bp) 
err_out_unregister_bus:

err_out_unregister_bus:

	mdiobus_unregister(bp->mii_bus);

	mdiobus_unregister(bp->mii_bus);

err_out_free_mdiobus:

err_out_free_mdiobus:

	of_node_put(bp->phy_node);

	if (np && of_phy_is_fixed_link(np))

	if (np && of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

		of_phy_deregister_fixed_link(np);

	mdiobus_free(bp->mii_bus);

	mdiobus_free(bp->mii_bus);
@@ -3552,6 +3553,7 @@ static int macb_probe(struct platform_device *pdev) 
err_out_unregister_mdio:

err_out_unregister_mdio:

	phy_disconnect(dev->phydev);

	phy_disconnect(dev->phydev);

	mdiobus_unregister(bp->mii_bus);

	mdiobus_unregister(bp->mii_bus);

	of_node_put(bp->phy_node);

	if (np && of_phy_is_fixed_link(np))

	if (np && of_phy_is_fixed_link(np))

		of_phy_deregister_fixed_link(np);

		of_phy_deregister_fixed_link(np);

	mdiobus_free(bp->mii_bus);

	mdiobus_free(bp->mii_bus);