---

yaml --- r: 215093 b: refs/heads/master c: 494486f h: refs/heads/master i: 215091: da56027 v: v3
git-mirror · Oct 6, 2010 · 8643830 · 8643830
1 parent 3226191
commit 8643830
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3207390a8b58bfc1335750f91cf6783c48ca19ca
+refs/heads/master: 494486f8fd0eec956c5df823581df5dcf5409a6f
diff --git a/trunk/net/mac80211/scan.c b/trunk/net/mac80211/scan.c
@@ -791,7 +791,8 @@ int ieee80211_request_internal_scan(struct ieee80211_sub_if_data *sdata,
  */
 void ieee80211_scan_cancel(struct ieee80211_local *local)
 {
-	bool abortscan, finish;
+	bool abortscan;
+	bool finish = false;
 
 	/*
 	 * We are only canceling software scan, or deferred scan that was not
@@ -818,7 +819,7 @@ void ieee80211_scan_cancel(struct ieee80211_local *local)
 	if (abortscan) {
 		/* The scan is canceled, but stop work from being pending */
 		cancel_delayed_work_sync(&local->scan_work);
-		if (finish)
-			__ieee80211_scan_completed_finish(&local->hw, false);
 	}
+	if (finish)
+		__ieee80211_scan_completed_finish(&local->hw, false);
 }