From e1ac302aca0bada79c4b5cace564c8d759997403 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@web.de>
Date: Sun, 19 Jul 2009 05:05:37 +0200
Subject: [PATCH] --- yaml --- r: 155868 b: refs/heads/master c:
 9e81eccf199d910e5ea8db377a43478e4eccd033 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f102919b3fce..08e68f084829 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e56f0975360369347725c49654ecfe3792710429
+refs/heads/master: 9e81eccf199d910e5ea8db377a43478e4eccd033
diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c
index f8e71b300001..9271118e1fc4 100644
--- a/trunk/net/wireless/scan.c
+++ b/trunk/net/wireless/scan.c
@@ -35,8 +35,6 @@ void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted)
 	else
 		nl80211_send_scan_done(wiphy_to_dev(request->wiphy), dev);
 
-	wiphy_to_dev(request->wiphy)->scan_req = NULL;
-
 #ifdef CONFIG_WIRELESS_EXT
 	if (!aborted) {
 		memset(&wrqu, 0, sizeof(wrqu));
@@ -48,6 +46,7 @@ void cfg80211_scan_done(struct cfg80211_scan_request *request, bool aborted)
 	dev_put(dev);
 
  out:
+	wiphy_to_dev(request->wiphy)->scan_req = NULL;
 	kfree(request);
 }
 EXPORT_SYMBOL(cfg80211_scan_done);