1 files changed, 8 insertions, 15 deletions

diff --git a/net/wireless/core.c b/net/wireless/core.c
index 221e76b53a97..99d86ddb6331 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -555,14 +555,18 @@ int wiphy_register(struct wiphy *wiphy)
         /* check and set up bitrates */
         ieee80211_set_bitrate_flags(wiphy);
 
-        rtnl_lock();
 
         res = device_add(&rdev->wiphy.dev);
+        if (res)
+                return res;
+
+        res = rfkill_register(rdev->rfkill);
         if (res) {
-                rtnl_unlock();
+                device_del(&rdev->wiphy.dev);
                 return res;
         }
 
+        rtnl_lock();
         /* set up regulatory info */
         wiphy_regulatory_register(wiphy);
 
@@ -589,17 +593,6 @@ int wiphy_register(struct wiphy *wiphy)
 
         cfg80211_debugfs_rdev_add(rdev);
 
-        res = rfkill_register(rdev->rfkill);
-        if (res) {
-                device_del(&rdev->wiphy.dev);
-
-                debugfs_remove_recursive(rdev->wiphy.debugfsdir);
-                list_del_rcu(&rdev->list);
-                wiphy_regulatory_deregister(wiphy);
-                rtnl_unlock();
-                return res;
-        }
-
         rdev->wiphy.registered = true;
         rtnl_unlock();
         return 0;
@@ -636,11 +629,11 @@ void wiphy_unregister(struct wiphy *wiphy)
                 rtnl_unlock();
                 __count == 0; }));
 
+        rfkill_unregister(rdev->rfkill);
+
         rtnl_lock();
         rdev->wiphy.registered = false;
 
-        rfkill_unregister(rdev->rfkill);
-
         BUG_ON(!list_empty(&rdev->wdev_list));
 
         /*