diff --git a/[refs] b/[refs]
index 41507545df25..a78b427d0f61 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 403a3a136122457165321e90b7569a321cc9ac12
+refs/heads/master: 558f6d3229ddb9f11ca4ffee0439046c283882ff
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index ea4c299fbe3b..5e14371cda70 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -2129,7 +2129,12 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
 		 * driver wanted to the wiphy to deal with conflicts
 		 */
 
-		BUG_ON(request_wiphy->regd);
+		/*
+		 * Userspace could have sent two replies with only
+		 * one kernel request.
+		 */
+		if (request_wiphy->regd)
+			return -EALREADY;
 
 		r = reg_copy_regd(&request_wiphy->regd, rd);
 		if (r)