From 84c9f08cbdd035c04c709b16afcf964f9e08562a Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Mon, 25 Apr 2011 18:35:48 -0700
Subject: [PATCH] --- yaml --- r: 247211 b: refs/heads/master c:
 c989bb15e95a93e20fc86783264f6298116e8651 h: refs/heads/master i:   247209:
 828eb433b4045ff6860e66cdd3fc5df9ff2c8b28   247207:
 73de028bf537c94b0383b341767ccd8ae8de8840 v: v3

---
 [refs]                   | 2 +-
 trunk/net/wireless/reg.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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));
 }