git.openpandora.org
/
pandora-wifi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wl1251: cancel elp_work early
[pandora-wifi.git]
/
drivers
/
net
/
wireless
/
wl12xx
/
wl1251_ps.c
diff --git
a/drivers/net/wireless/wl12xx/wl1251_ps.c
b/drivers/net/wireless/wl12xx/wl1251_ps.c
index
ff71cf3
..
f5b90a1
100644
(file)
--- a/
drivers/net/wireless/wl12xx/wl1251_ps.c
+++ b/
drivers/net/wireless/wl12xx/wl1251_ps.c
@@
-60,7
+60,6
@@
void wl1251_ps_elp_sleep(struct wl1251 *wl)
unsigned long delay;
if (wl->psm) {
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);
}
delay = msecs_to_jiffies(ELP_ENTRY_DELAY);
ieee80211_queue_delayed_work(wl->hw, &wl->elp_work, delay);
}
@@
-71,6
+70,9
@@
int wl1251_ps_elp_wakeup(struct wl1251 *wl)
unsigned long timeout, start;
u32 elp_reg;
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;
if (!wl->elp)
return 0;