---

yaml --- r: 352200 b: refs/heads/master c: d935e38 h: refs/heads/master v: v3
git-mirror · Dec 5, 2012 · 975755d · 975755d
1 parent e9e65ad
commit 975755d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c145185175dcca660265d2fcdd4feffc0249f8e
+refs/heads/master: d935e385f88616fa867406de97521e07fe41539d
diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c
@@ -1852,8 +1852,8 @@ static void wlcore_op_stop_locked(struct wl1271 *wl)
 	cancel_delayed_work_sync(&wl->tx_watchdog_work);
 
 	/* let's notify MAC80211 about the remaining pending TX frames */
-	wl12xx_tx_reset(wl);
 	mutex_lock(&wl->mutex);
+	wl12xx_tx_reset(wl);
 
 	wl1271_power_off(wl);
 	/*