From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pankaj Bansal Date: Fri, 13 Jul 2018 20:10:33 +0530 Subject: [U-Boot] [PATCH 3/6] driver: net: fsl-mc: fix error handing in init_phy In-Reply-To: <20180713144036.17606-1-pankaj.bansal@nxp.com> References: <20180713144036.17606-1-pankaj.bansal@nxp.com> Message-ID: <20180713144036.17606-4-pankaj.bansal@nxp.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de if an error occurs during init_phy, we should free the phydev structure which has been allocated by phy_connect. Signed-off-by: Pankaj Bansal --- drivers/net/ldpaa_eth/ldpaa_eth.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index fbc724fc33..8fcb948ee8 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -23,6 +23,7 @@ static int init_phy(struct eth_device *dev) struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv; struct phy_device *phydev = NULL; struct mii_dev *bus; + int ret; bus = wriop_get_mdio(priv->dpmac_id); if (bus == NULL) @@ -37,7 +38,15 @@ static int init_phy(struct eth_device *dev) wriop_set_phy_dev(priv->dpmac_id, phydev); - return phy_config(phydev); + ret = phy_config(phydev); + + if (ret) { + free(phydev); + phydev = NULL; + wriop_set_phy_dev(priv->dpmac_id, phydev); + } + + return ret; } #endif -- 2.17.1