From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 6 Oct 2010 20:40:40 +0000 (-0400)
Subject: mac80211: avoid uninitialized var warning in ieee80211_scan_cancel
X-Git-Tag: v2.6.37-rc1~147^2~191^2^2~8
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=494486f8fd0eec956c5df823581df5dcf5409a6f;p=~emulex%2Finfiniband.git

mac80211: avoid uninitialized var warning in ieee80211_scan_cancel

net/mac80211/scan.c: In function ‘ieee80211_scan_cancel’:
net/mac80211/scan.c:794: warning: ‘finish’ may be used uninitialized in this function

Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 80e017df5f3..523db930dab 100644
--- a/net/mac80211/scan.c
+++ b/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);
 }