From 3d9cb0dd38b532461fa05ac2d9897b096dec5493 Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 12 Nov 2008 14:22:00 -0800
Subject: [PATCH] --- yaml --- r: 122271 b: refs/heads/master c:
 02ba0b3263f4eb41d2a5714cbe99207ae491a964 h: refs/heads/master i:   122269:
 14ab80b0b2fd6500d2645d485266164e2f629d91   122267:
 3268f47540a94b957973154cd050b9716706d49d   122263:
 2b957d27f08e9561eb7e4d3de86c1ad2ad8a1db5   122255:
 65e3bf88ff4446b5345f8f6b22ffdbedf717cad8   122239:
 d88f660716b785f96518cf6fe8ea4e6d8486b126 v: v3

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

diff --git a/[refs] b/[refs]
index 861eb8dc8abb..be9b382bb793 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a01ddafd43f7d53a65ef053eb80a4dee58839c1f
+refs/heads/master: 02ba0b3263f4eb41d2a5714cbe99207ae491a964
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index f062b8b7000a..f8e7beb23add 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -711,14 +711,7 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
 
 	kfree(last_request);
 	last_request = request;
-	r = call_crda(alpha2);
-
-#ifndef CONFIG_WIRELESS_OLD_REGULATORY
-	if (r)
-		printk(KERN_ERR "cfg80211: Failed calling CRDA\n");
-#endif
-
-	return r;
+	return call_crda(alpha2);
 }
 
 void regulatory_hint(struct wiphy *wiphy, const char *alpha2)