From 25b021a68b0471e44566b5200155e0ab157ca32e Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Sat, 21 Feb 2009 00:04:27 -0500
Subject: [PATCH] --- yaml --- r: 134928 b: refs/heads/master c:
 d335fe6391c2d86582cf71ef5773a161ee604608 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 93915cb7c3ad..0b6e18c202bf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 806a9e39670be4f1f861c346ec102a79e81b90c3
+refs/heads/master: d335fe6391c2d86582cf71ef5773a161ee604608
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index d44f3b5481ad..b47445219a48 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -1261,11 +1261,13 @@ void regulatory_hint_11d(struct wiphy *wiphy,
 	u32 checksum = 0;
 	enum environment_cap env = ENVIRON_ANY;
 
-	if (!last_request)
-		return;
-
 	mutex_lock(&cfg80211_mutex);
 
+	if (unlikely(!last_request)) {
+		mutex_unlock(&cfg80211_mutex);
+		return;
+	}
+
 	/* IE len must be evenly divisible by 2 */
 	if (country_ie_len & 0x01)
 		goto out;