xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: net: xgene: Fix error deconstruction path

Browse Source 
Since register_netdev() call in xgene_enet_probe() was moved down to
the end, it doesn't properly handle errors that may occur, by
deconstructing everything that was setup before the error occurred.

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Iyappan Subramanian
2016-08-12 22:05:40 -07:00
committed by David S. Miller
parent 15e32296e4
commit cecd6e510c
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/ethernet/apm/xgene/xgene_enet_main.c
View File

@@ -1641,8 +1641,8 @@ static int xgene_enet_probe(struct platform_device *pdev)
} }
#endif #endif
if (!pdata->enet_id) { if (!pdata->enet_id) {
free_netdev(ndev); ret = -ENODEV;
return -ENODEV; goto err;
} }
ret = xgene_enet_get_resources(pdata); ret = xgene_enet_get_resources(pdata);
@@ -1665,7 +1665,7 @@ static int xgene_enet_probe(struct platform_device *pdev)
ret = xgene_enet_init_hw(pdata); ret = xgene_enet_init_hw(pdata);
if (ret) if (ret)
goto err_netdev; goto err;
link_state = pdata->mac_ops->link_state; link_state = pdata->mac_ops->link_state;
if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) { if (pdata->phy_mode == PHY_INTERFACE_MODE_XGMII) {
@@ -1675,21 +1675,32 @@ static int xgene_enet_probe(struct platform_device *pdev)
ret = xgene_enet_mdio_config(pdata); ret = xgene_enet_mdio_config(pdata);
else else
INIT_DELAYED_WORK(&pdata->link_work, link_state); INIT_DELAYED_WORK(&pdata->link_work, link_state);
}
if (ret) if (ret)
goto err; goto err1;
}
xgene_enet_napi_add(pdata); xgene_enet_napi_add(pdata);
ret = register_netdev(ndev); ret = register_netdev(ndev);
if (ret) { if (ret) {
netdev_err(ndev, "Failed to register netdev\n"); netdev_err(ndev, "Failed to register netdev\n");
goto err; goto err2;
} }
return 0; return 0;
err_netdev: err2:
unregister_netdev(ndev); /*
* If necessary, free_netdev() will call netif_napi_del() and undo
* the effects of xgene_enet_napi_add()'s calls to netif_napi_add().
*/
if (pdata->mdio_driver)
xgene_enet_phy_disconnect(pdata);
else if (pdata->phy_mode == PHY_INTERFACE_MODE_RGMII)
xgene_enet_mdio_remove(pdata);
err1:
xgene_enet_delete_desc_rings(pdata);
err: err:
free_netdev(ndev); free_netdev(ndev);
return ret; return ret;