renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 10:44:14 +08:00
Code

staging: wilc1000: return exact error of register_netdev() from wilc_netdev_init()

Browse Source 
Refactor wilc_netdev_init() to return the error code received from
register_netdev() during the failure condition.

Earlier discussion link
[1]. https://www.spinics.net/lists/linux-wireless/msg177304.html

Suggested-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ajay Singh 2018-09-25 11:53:44 +05:30 committed by Greg Kroah-Hartman
parent ba853fe6f8
commit 454dc5905d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/wilc1000/linux_wlan.c
View File

@ -1062,7 +1062,8 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
if (!wl)
return -ENOMEM;
if (wilc_wlan_cfg_init(wl))
ret = wilc_wlan_cfg_init(wl);
if (ret)
goto free_wl;
*wilc = wl;
@ -1074,8 +1075,10 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
INIT_LIST_HEAD(&wl->rxq_head.list);
wl->hif_workqueue = create_singlethread_workqueue("WILC_wq");
if (!wl->hif_workqueue)
if (!wl->hif_workqueue) {
ret = -ENOMEM;
goto free_cfg;
}
register_inetaddr_notifier(&g_dev_notifier);
@ -1083,8 +1086,10 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
struct wireless_dev *wdev;
ndev = alloc_etherdev(sizeof(struct wilc_vif));
if (!ndev)
if (!ndev) {
ret = -ENOMEM;
goto free_ndev;
}
vif = netdev_priv(ndev);
memset(vif, 0, sizeof(struct wilc_vif));
@ -1107,6 +1112,7 @@ int wilc_netdev_init(struct wilc **wilc, struct device *dev, int io_type,
wdev = wilc_create_wiphy(ndev, dev);
if (!wdev) {
netdev_err(ndev, "Can't register WILC Wiphy\n");
ret = -ENOMEM;
goto free_ndev;
}
@ -1148,7 +1154,7 @@ free_cfg:
wilc_wlan_cfg_deinit(wl);
free_wl:
kfree(wl);
return -ENOMEM;
return ret;
}
EXPORT_SYMBOL_GPL(wilc_netdev_init);