diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2016-12-28 15:44:41 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-12-29 12:08:11 -0500 |
| commit | b2eb09af7370fedc6b9d9f05762f01625438467a (patch) | |
| tree | e7cdc336ec82e8bac2992476992669751ddf3db5 /drivers/net | |
| parent | ipv6: Should use consistent conditional judgement for ip6 fragment between __ip6_append_data and ip6_finish_output (diff) | |
| download | linux-dev-b2eb09af7370fedc6b9d9f05762f01625438467a.tar.xz linux-dev-b2eb09af7370fedc6b9d9f05762f01625438467a.zip | |
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 <f.fainelli@gmail.com>
Acked-by: Kweh, Hock Leong <hock.leong.kweh@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 9 |
1 files changed, 8 insertions, 1 deletions
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: |