aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r--net/wireless/core.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 5031db7b275b..72825afe2bf6 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -301,12 +301,10 @@ int wiphy_register(struct wiphy *wiphy)
301 /* check and set up bitrates */ 301 /* check and set up bitrates */
302 ieee80211_set_bitrate_flags(wiphy); 302 ieee80211_set_bitrate_flags(wiphy);
303 303
304 mutex_lock(&cfg80211_drv_mutex);
305
304 /* set up regulatory info */ 306 /* set up regulatory info */
305 mutex_lock(&cfg80211_reg_mutex);
306 wiphy_update_regulatory(wiphy, REGDOM_SET_BY_CORE); 307 wiphy_update_regulatory(wiphy, REGDOM_SET_BY_CORE);
307 mutex_unlock(&cfg80211_reg_mutex);
308
309 mutex_lock(&cfg80211_drv_mutex);
310 308
311 res = device_add(&drv->wiphy.dev); 309 res = device_add(&drv->wiphy.dev);
312 if (res) 310 if (res)