projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'qcom-soc-for-4.7-2' into net-next
[linux-2.6-block.git]
/
drivers
/
net
/
wireless
/
ti
/
wl1251
/
ps.c
diff --git
a/drivers/net/wireless/ti/wl1251/ps.c
b/drivers/net/wireless/ti/wl1251/ps.c
index b9e27b98bbc928ac2c7eb7dd9e48053c87ef60bf..fa01b0a0f312abd20092478e6aa768997f326d26 100644
(file)
--- a/
drivers/net/wireless/ti/wl1251/ps.c
+++ b/
drivers/net/wireless/ti/wl1251/ps.c
@@
-32,7
+32,7
@@
void wl1251_elp_work(struct work_struct *work)
struct delayed_work *dwork;
struct wl1251 *wl;
- dwork =
container_of(work, struct delayed_work,
work);
+ dwork =
to_delayed_work(
work);
wl = container_of(dwork, struct wl1251, elp_work);
wl1251_debug(DEBUG_PSM, "elp work");