From e158eaff729dd2c1ad1f70c658935340682fad15 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 7 Oct 2010 12:55:24 +0200
Subject: [PATCH] --- yaml --- r: 215106 b: refs/heads/master c:
 7b99a7c2dab7efe7c265b66fedbf3444958ebfe3 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index fe2ac9a8df84..4a5603cd27c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b34d432b0fcff422304de4eb49d6da861fe335c
+refs/heads/master: 7b99a7c2dab7efe7c265b66fedbf3444958ebfe3
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
index 523db930dabb..fb274db77e3c 100644
--- a/trunk/net/mac80211/scan.c
+++ b/trunk/net/mac80211/scan.c
@@ -681,8 +681,6 @@ void ieee80211_scan_work(struct work_struct *work)
 		goto out_complete;
 	}
 
-	mutex_unlock(&local->mtx);
-
 	/*
 	 * as long as no delay is required advance immediately
 	 * without scheduling a new work
@@ -713,6 +711,7 @@ void ieee80211_scan_work(struct work_struct *work)
 	} while (next_delay == 0);
 
 	ieee80211_queue_delayed_work(&local->hw, &local->scan_work, next_delay);
+	mutex_unlock(&local->mtx);
 	return;
 
 out_complete: