diff --git a/[refs] b/[refs] index 8dcaaacbd3d7..ab070ff2861c 100644 --- 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 index db719f7d2692..b9e27b98bbc9 100644 --- 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;