> -----Original Message----- > From: Florian Fainelli [mailto:[email protected]] > Sent: Thursday, December 29, 2016 7:45 AM > To: [email protected] > Cc: Florian Fainelli <[email protected]>; [email protected]; > [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; > [email protected]; Ong, Boon Leong <[email protected]>; Voon, > Weifeng <[email protected]>; [email protected]; linux- > [email protected]; Giuseppe Cavallaro <[email protected]>; > Alexandre Torgue <[email protected]> > Subject: [PATCH net] net: stmmac: Fix error path after register_netdev move > > Commit 5701659004d6 ("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: 5701659004d6 ("net: stmmac: Fix race between stmmac_drv_probe and > stmmac_open") > Signed-off-by: Florian Fainelli <[email protected]> > ---
Acked-by: Kweh, Hock Leong <[email protected]> > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 5910ea51f8f6..39eb7a65bb9f 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -3366,12 +3366,19 @@ int stmmac_dvr_probe(struct device *device, > } > > ret = register_netdev(ndev); > - if (ret) > + if (ret) { > netdev_err(priv->dev, "%s: ERROR %i registering the device\n", > __func__, ret); > + goto error_netdev_register; > + } > > 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: > netif_napi_del(&priv->napi); > error_hw_init: > -- > 2.9.3
