---

yaml --- r: 290561 b: refs/heads/master c: a454969 h: refs/heads/master i: 290559: fb5cd08 v: v3
git-mirror · Feb 15, 2012 · 4da3f68 · 4da3f68
1 parent 589899c
commit 4da3f68
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3df1331f25f782e838a3ecb72cec86b539ac02f
+refs/heads/master: a454969ede024a209e6a755d5f7a928ab81ed00c
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -1406,8 +1406,6 @@ int wl1271_plt_stop(struct wl1271 *wl)
 		goto out;
 	}
 
-	wl1271_power_off(wl);
-
 	wl->state = WL1271_STATE_OFF;
 	wl->rx_counter = 0;
 
@@ -1417,6 +1415,11 @@ int wl1271_plt_stop(struct wl1271 *wl)
 	wl1271_flush_deferred_work(wl);
 	cancel_work_sync(&wl->netstack_work);
 	cancel_work_sync(&wl->recovery_work);
+
+	mutex_lock(&wl->mutex);
+	wl1271_power_off(wl);
+	mutex_unlock(&wl->mutex);
+
 out:
 	return ret;
 }