From: Michael Grzeschik <m.grzeschik@pengutronix.de>
To: nicolas.ferre@microchip.com
Cc: netdev@vger.kernel.org, kernel@pengutronix.de, andrew@lunn.ch
Subject: [PATCH v2 2/2] net: macb: add of_node_put to error paths
Date: Wed, 8 Nov 2017 09:56:35 +0100 [thread overview]
Message-ID: <20171108085635.2742-3-m.grzeschik@pengutronix.de> (raw)
In-Reply-To: <20171108085635.2742-1-m.grzeschik@pengutronix.de>
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>
---
v2: removed extra of_node_put from macb_remove
drivers/net/ethernet/cadence/macb_main.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index b7846d6e9234e..0f24ca5a24b53 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -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);
@@ -3554,6 +3555,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);
--
2.11.0
next prev parent reply other threads:[~2017-11-08 8:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 8:56 [PATCH v2 0/2] net: macb: add error handling on probe and Michael Grzeschik
2017-11-08 8:56 ` [PATCH v2 1/2] net: macb: add of_phy_deregister_fixed_link to error paths Michael Grzeschik
2017-11-08 9:26 ` Nicolas Ferre
2017-11-08 8:56 ` Michael Grzeschik [this message]
2017-11-08 9:26 ` [PATCH v2 2/2] net: macb: add of_node_put " Nicolas Ferre
2017-11-11 6:28 ` [PATCH v2 0/2] net: macb: add error handling on probe and David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171108085635.2742-3-m.grzeschik@pengutronix.de \
--to=m.grzeschik@pengutronix.de \
--cc=andrew@lunn.ch \
--cc=kernel@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=nicolas.ferre@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.