Skip to content

Commit

Permalink
drivers: net: xgene: Fix error handling
Browse files Browse the repository at this point in the history
When probe bails out with an error, we try to unregister the
netdev before we have even registered it. Fix the goto statements
for that.

Signed-off-by: Matthias Brugger <mbrugger@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
mbgg authored and davem330 committed May 4, 2016
1 parent 7391daf commit 20decb7
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/net/ethernet/apm/xgene/xgene_enet_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1595,21 +1595,22 @@ static int xgene_enet_probe(struct platform_device *pdev)

ret = xgene_enet_init_hw(pdata);
if (ret)
goto err;
goto err_netdev;

mac_ops = pdata->mac_ops;
if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) {
ret = xgene_enet_mdio_config(pdata);
if (ret)
goto err;
goto err_netdev;
} else {
INIT_DELAYED_WORK(&pdata->link_work, mac_ops->link_state);
}

xgene_enet_napi_add(pdata);
return 0;
err:
err_netdev:
unregister_netdev(ndev);
err:
free_netdev(ndev);
return ret;
}
Expand Down

0 comments on commit 20decb7

Please sign in to comment.