]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
driver: net: fsl-mc: fix error handing in init_phy
authorPankaj Bansal <pankaj.bansal@nxp.com>
Wed, 10 Oct 2018 08:38:31 +0000 (14:08 +0530)
committerJoe Hershberger <joe.hershberger@ni.com>
Wed, 10 Oct 2018 17:43:18 +0000 (12:43 -0500)
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 <pankaj.bansal@nxp.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
drivers/net/ldpaa_eth/ldpaa_eth.c

index 39f81daafddfca54cbd96e98050a0f7786951619..ef5286c325b08a900315c266037a7c9b17f20216 100644 (file)
@@ -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,14 @@ 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);
+               wriop_set_phy_dev(priv->dpmac_id, NULL);
+       }
+
+       return ret;
 }
 #endif