---

yaml --- r: 350259 b: refs/heads/master c: 02957f9 h: refs/heads/master i: 350257: 2e4aa67 350255: afdd673 v: v3
git-mirror · Dec 28, 2012 · c5e0039 · c5e0039
1 parent 90a679d
commit c5e0039
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d394e192541a106bf78f361e2c4e586a8344e3e
+refs/heads/master: 02957f92bcc96be5c84a4000f9d22c592158602e
diff --git a/trunk/drivers/net/wireless/ti/wl1251/ps.c b/trunk/drivers/net/wireless/ti/wl1251/ps.c
@@ -68,8 +68,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl)
 	unsigned long timeout, start;
 	u32 elp_reg;
 
-	if (delayed_work_pending(&wl->elp_work))
-		cancel_delayed_work(&wl->elp_work);
+	cancel_delayed_work(&wl->elp_work);
 
 	if (!wl->elp)
 		return 0;