evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: rtl8723au: rtw_wdev_alloc(): Don't register wiphy before kmalloc() completed

Browse source 
There is no point starting to register the wiphy and then having to
unregister it again if the followon kmalloc() fails.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2014-05-25 22:43:18 +02:00 • committed by Greg Kroah-Hartman
parent 56b0bd91e0
commit d165e4efbc
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
View file

@ -3367,22 +3367,24 @@ int rtw_wdev_alloc(struct rtw_adapter *padapter, struct device *dev)
ret = -ENOMEM; ret = -ENOMEM;
goto exit; goto exit;
} }
set_wiphy_dev(wiphy, dev);
rtw_cfg80211_preinit_wiphy(padapter, wiphy);
ret = wiphy_register(wiphy);
if (ret < 0) {
DBG_8723A("Couldn't register wiphy device\n");
goto free_wiphy;
}
/* wdev */ /* wdev */
wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL); wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL);
if (!wdev) { if (!wdev) {
DBG_8723A("Couldn't allocate wireless device\n"); DBG_8723A("Couldn't allocate wireless device\n");
ret = -ENOMEM; ret = -ENOMEM;
goto unregister_wiphy; goto free_wiphy;
} }
set_wiphy_dev(wiphy, dev);
rtw_cfg80211_preinit_wiphy(padapter, wiphy);
ret = wiphy_register(wiphy);
if (ret < 0) {
DBG_8723A("Couldn't register wiphy device\n");
goto free_wdev;
}
wdev->wiphy = wiphy; wdev->wiphy = wiphy;
wdev->netdev = pnetdev; wdev->netdev = pnetdev;
/* wdev->iftype = NL80211_IFTYPE_STATION; */ /* wdev->iftype = NL80211_IFTYPE_STATION; */
@ -3408,8 +3410,8 @@ int rtw_wdev_alloc(struct rtw_adapter *padapter, struct device *dev)
pwdev_priv->power_mgmt = false; pwdev_priv->power_mgmt = false;
return ret; return ret;
unregister_wiphy: free_wdev:
wiphy_unregister(wiphy); kfree(wdev);
free_wiphy: free_wiphy:
wiphy_free(wiphy); wiphy_free(wiphy);
exit: exit: