1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/wireless/wl1251/ps.c b/drivers/net/wireless/wl1251/ps.c
index 842155e65a8..9cc514703d2 100644
--- a/drivers/net/wireless/wl1251/ps.c
+++ b/drivers/net/wireless/wl1251/ps.c
@@ -58,7 +58,6 @@ void wl1251_ps_elp_sleep(struct wl1251 *wl)
         unsigned long delay;
 
         if (wl->psm) {
-                cancel_delayed_work(&wl->elp_work);
                 delay = msecs_to_jiffies(ELP_ENTRY_DELAY);
                 ieee80211_queue_delayed_work(wl->hw, &wl->elp_work, delay);
         }
@@ -69,6 +68,9 @@ 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);
+
         if (!wl->elp)
                 return 0;