From 4766862999f6a649911da8342f00052f2e6c09e8 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kvalo@qca.qualcomm.com>
Date: Thu, 12 Jul 2012 15:33:58 +0300
Subject: [PATCH] --- yaml --- r: 315581 b: refs/heads/master c:
 959085352b7c44ff9bae4d8a4d76146193260e4c h: refs/heads/master i:   315579:
 00310c97f097c6d1c62740044df18f2ae7779b40 v: v3

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

diff --git a/[refs] b/[refs]
index c26366349be0..fced2fec6048 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84f10708f73254878246772cead70a2eb6a123f2
+refs/heads/master: 959085352b7c44ff9bae4d8a4d76146193260e4c
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index b2b32229b607..ad6f9029c564 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -2128,7 +2128,7 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
 		 * checking if the alpha2 changes if CRDA was already called
 		 */
 		if (!regdom_changes(rd->alpha2))
-			return -EINVAL;
+			return -EALREADY;
 	}
 
 	/*
@@ -2248,6 +2248,9 @@ int set_regdom(const struct ieee80211_regdomain *rd)
 	/* Note that this doesn't update the wiphys, this is done below */
 	r = __set_regdom(rd);
 	if (r) {
+		if (r == -EALREADY)
+			reg_set_request_processed();
+
 		kfree(rd);
 		mutex_unlock(&reg_mutex);
 		return r;