From 1c419f748060f8e87fddda663e6b9e72678c34bf Mon Sep 17 00:00:00 2001
From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 24 Apr 2009 14:09:31 -0700
Subject: [PATCH] --- yaml --- r: 150139 b: refs/heads/master c:
 0ef9ccdd9ec7f2cf28d0605c216d853687f5291d h: refs/heads/master i:   150137:
 786d0ff505fec7fbc224c3a24b9121943a9ac83d   150135:
 20538a7df679a9b60b34004224f9483766f47564 v: v3

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

diff --git a/[refs] b/[refs]
index c0c061b2a4bc..38f7b342a5f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2cfb1f5e20f260e6ff306ba181efee956ba48f54
+refs/heads/master: 0ef9ccdd9ec7f2cf28d0605c216d853687f5291d
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index f38cc39fa79e..9fea910204db 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -2100,14 +2100,14 @@ void reg_device_remove(struct wiphy *wiphy)
 
 	assert_cfg80211_lock();
 
+	kfree(wiphy->regd);
+
 	if (last_request)
 		request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
 
-	kfree(wiphy->regd);
-	if (!last_request || !request_wiphy)
-		return;
-	if (request_wiphy != wiphy)
+	if (!request_wiphy || request_wiphy != wiphy)
 		return;
+
 	last_request->wiphy_idx = WIPHY_IDX_STALE;
 	last_request->country_ie_env = ENVIRON_ANY;
 }