From e07486d3c9b155971fa1450a0691c838bac0af50 Mon Sep 17 00:00:00 2001 From: Juuso Oikarinen Date: Thu, 29 Jul 2010 04:54:45 +0300 Subject: [PATCH] --- yaml --- r: 215035 b: refs/heads/master c: 76a029fbfb18c42f75c891842df26605ef87add0 h: refs/heads/master i: 215033: b52bb0c387e43a51359a73b5569b838991c2ebe4 215031: 82304b59e8b3d3120661c41d28134a77dec92ab0 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 2 +- trunk/drivers/net/wireless/wl12xx/wl1271_scan.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index be66430f7ee9..138910d8d50b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c2c192ac6c16e2e8f5cc8cf54e02bb1d4e0e761d +refs/heads/master: 76a029fbfb18c42f75c891842df26605ef87add0 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c index 45d4ce36343c..02ad6c648115 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c @@ -1015,10 +1015,10 @@ static void wl1271_op_remove_interface(struct ieee80211_hw *hw, ieee80211_enable_dyn_ps(wl->vif); if (wl->scan.state != WL1271_SCAN_STATE_IDLE) { - ieee80211_scan_completed(wl->hw, true); wl->scan.state = WL1271_SCAN_STATE_IDLE; kfree(wl->scan.scanned_ch); wl->scan.scanned_ch = NULL; + ieee80211_scan_completed(wl->hw, true); } wl->state = WL1271_STATE_OFF; diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c b/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c index 9c80ba9b6be0..8ceaabe26e64 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1271_scan.c @@ -215,12 +215,11 @@ void wl1271_scan_stm(struct wl1271 *wl) break; case WL1271_SCAN_STATE_DONE: - ieee80211_scan_completed(wl->hw, false); - kfree(wl->scan.scanned_ch); wl->scan.scanned_ch = NULL; wl->scan.state = WL1271_SCAN_STATE_IDLE; + ieee80211_scan_completed(wl->hw, false); break; default: