Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2eb09af authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: stmmac: Fix error path after register_netdev move 



Commit 57016590 ("net: stmmac: Fix race between stmmac_drv_probe and
stmmac_open") re-ordered how the MDIO bus registration and the network
device are registered, but missed to unwind the MDIO bus registration in
case we fail to register the network device.

Fixes: 57016590 ("net: stmmac: Fix race between stmmac_drv_probe and stmmac_open")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarKweh, Hock Leong <hock.leong.kweh@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4c5e13a

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -3366,12 +3366,19 @@ int stmmac_dvr_probe(struct device *device, 
	}

	}





	ret = register_netdev(ndev);

	ret = register_netdev(ndev);

	if (ret)

	if (ret) {

		netdev_err(priv->dev, "%s: ERROR %i registering the device\n",

		netdev_err(priv->dev, "%s: ERROR %i registering the device\n",

			   __func__, ret);

			   __func__, ret);

		goto error_netdev_register;

	}





	return ret;

	return ret;





error_netdev_register:

	if (priv->hw->pcs != STMMAC_PCS_RGMII &&

	    priv->hw->pcs != STMMAC_PCS_TBI &&

	    priv->hw->pcs != STMMAC_PCS_RTBI)

		stmmac_mdio_unregister(ndev);

error_mdio_register:

error_mdio_register:

	netif_napi_del(&priv->napi);

	netif_napi_del(&priv->napi);

error_hw_init:

error_hw_init: