OSDN Git Service

net: macb: add of_node_put to error paths
authorMichael Grzeschik <m.grzeschik@pengutronix.de>
Wed, 8 Nov 2017 08:56:35 +0000 (09:56 +0100)
committerDavid S. Miller <davem@davemloft.net>
Sat, 11 Nov 2017 06:27:44 +0000 (15:27 +0900)
We add the call of_node_put(bp->phy_node) to all associated error
paths for memory clean up.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb_main.c

index cc3f36a..72a67f7 100644 (file)
@@ -611,6 +611,7 @@ static int macb_mii_init(struct macb *bp)
 err_out_unregister_bus:
        mdiobus_unregister(bp->mii_bus);
 err_out_free_mdiobus:
+       of_node_put(bp->phy_node);
        if (np && of_phy_is_fixed_link(np))
                of_phy_deregister_fixed_link(np);
        mdiobus_free(bp->mii_bus);
@@ -3552,6 +3553,7 @@ static int macb_probe(struct platform_device *pdev)
 err_out_unregister_mdio:
        phy_disconnect(dev->phydev);
        mdiobus_unregister(bp->mii_bus);
+       of_node_put(bp->phy_node);
        if (np && of_phy_is_fixed_link(np))
                of_phy_deregister_fixed_link(np);
        mdiobus_free(bp->mii_bus);