From 951b68068b428b739a7ea813f93c7e973ae740e7 Mon Sep 17 00:00:00 2001
From: Luciano Coelho <coelho@ti.com>
Date: Wed, 11 Jan 2012 09:42:42 +0200
Subject: [PATCH] --- yaml --- r: 290563 b: refs/heads/master c:
 f6fbeccd3e513c23de9cd8562f2b2e78d4d17912 h: refs/heads/master i:   290561:
 4da3f689440e40d9cf8c5cf9fe2eb0e6ad33fa6c   290559:
 fb5cd08d0a81d3f00e7f4621708ee20bdbf2d509 v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/main.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ec4889e888d3..6cd67d08dbe0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46b0cc9ffce356fbcb2135219a3ed8500714a9e4
+refs/heads/master: f6fbeccd3e513c23de9cd8562f2b2e78d4d17912
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 3a1636b68cd2..3587afcd6469 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -1420,17 +1420,18 @@ int wl1271_plt_stop(struct wl1271 *wl)
 		goto out;
 	}
 
-	wl->state = WL1271_STATE_OFF;
-	wl->rx_counter = 0;
-
 	mutex_unlock(&wl->mutex);
 
 	wl1271_flush_deferred_work(wl);
 	cancel_work_sync(&wl->netstack_work);
 	cancel_work_sync(&wl->recovery_work);
+	cancel_delayed_work_sync(&wl->elp_work);
 
 	mutex_lock(&wl->mutex);
 	wl1271_power_off(wl);
+	wl->flags = 0;
+	wl->state = WL1271_STATE_OFF;
+	wl->rx_counter = 0;
 	mutex_unlock(&wl->mutex);
 
 out: