From 86438309fa2b016167bc67fc018ad67fde5fe3de Mon Sep 17 00:00:00 2001 From: "John W. Linville" Date: Wed, 6 Oct 2010 16:40:40 -0400 Subject: [PATCH] --- yaml --- r: 215093 b: refs/heads/master c: 494486f8fd0eec956c5df823581df5dcf5409a6f h: refs/heads/master i: 215091: da56027eed84c2e10178ee0796cebd1b236d2690 v: v3 --- [refs] | 2 +- trunk/net/mac80211/scan.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c9f003983e81..d7526b4afd4c 100644 --- 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 index 80e017df5f31..523db930dabb 100644 --- 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); }