diff --git a/[refs] b/[refs]
index 940fd6beb865..90ace5df011a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3bb1429a2c1470d1f84646c00e34dc6784ee06e
+refs/heads/master: c989bb15e95a93e20fc86783264f6298116e8651
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 2714379ce2d6..8982053f9961 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1455,7 +1455,8 @@ static void reg_process_hint(struct regulatory_request *reg_request)
 	 * We only time out user hints, given that they should be the only
 	 * source of bogus requests.
 	 */
-	if (reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
+	if (r != -EALREADY &&
+	    reg_request->initiator == NL80211_REGDOM_SET_BY_USER)
 		schedule_delayed_work(&reg_timeout, msecs_to_jiffies(3142));
 }