On Wed, Nov 08, 2017 at 01:22:57PM +0900, David Miller wrote:
From: Michael Grzeschik <redacted>
Date: Mon, 6 Nov 2017 12:10:04 +0100
quoted
We add the call of_phy_deregister_fixed_link to all associated
error paths for memory clean up.
Signed-off-by: Michael Grzeschik <redacted>
---
drivers/net/ethernet/cadence/macb_main.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 6df2cad61647a..2c2acd011329a 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -611,6 +611,8 @@ static int macb_mii_init(struct macb *bp)
err_out_unregister_bus:
mdiobus_unregister(bp->mii_bus);
err_out_free_mdiobus:
+ if ((np) && (of_phy_is_fixed_link(np)))
Please don't use so many parenthesis in your conditionals:
if (np && of_phy_is_fixed_link(np))
is more than sufficient.
Please fix this in your entire set of patches.
There are only two patches and not even in one series.
I will resend them both with this one fixed and create
a series. As the second one depends on this one.
Thanks,
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |