---

yaml --- r: 299994 b: refs/heads/master c: 4c1bcdb h: refs/heads/master v: v3
git-mirror · Apr 27, 2012 · 2a93c13 · 2a93c13
1 parent 03592f4
commit 2a93c13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 328c32f0f85467af5a6c4c3289e168d9ad2555af
+refs/heads/master: 4c1bcdb5a3354b250b82a67549f57ac27a3bb85f
diff --git a/trunk/drivers/net/wireless/wl1251/main.c b/trunk/drivers/net/wireless/wl1251/main.c
@@ -479,6 +479,7 @@ static void wl1251_op_stop(struct ieee80211_hw *hw)
 	cancel_work_sync(&wl->irq_work);
 	cancel_work_sync(&wl->tx_work);
 	cancel_work_sync(&wl->filter_work);
+	cancel_delayed_work_sync(&wl->elp_work);
 
 	mutex_lock(&wl->mutex);