diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
| commit | 409ec36c320d580a036045e603f96286c362c609 (patch) | |
| tree | 3dd9b3569799f7962b523a068052445e2d2c51aa /drivers/net/wireless/wl12xx/ps.c | |
| parent | 1b7fe59322bef9e7a2c05b64a07a66b875299736 (diff) | |
| parent | 8d5eab5aa676378b4c9daa62d10d08a0bca04677 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/ps.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/ps.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/ps.c b/drivers/net/wireless/wl12xx/ps.c index 5c347b1bd17..971f13e792d 100644 --- a/drivers/net/wireless/wl12xx/ps.c +++ b/drivers/net/wireless/wl12xx/ps.c @@ -69,7 +69,7 @@ void wl1271_ps_elp_sleep(struct wl1271 *wl) } } -int wl1271_ps_elp_wakeup(struct wl1271 *wl, bool chip_awake) +int wl1271_ps_elp_wakeup(struct wl1271 *wl) { DECLARE_COMPLETION_ONSTACK(compl); unsigned long flags; @@ -87,7 +87,7 @@ int wl1271_ps_elp_wakeup(struct wl1271 *wl, bool chip_awake) * the completion variable in one entity. */ spin_lock_irqsave(&wl->wl_lock, flags); - if (work_pending(&wl->irq_work) || chip_awake) + if (test_bit(WL1271_FLAG_IRQ_RUNNING, &wl->flags)) pending = true; else wl->elp_compl = &compl; @@ -149,7 +149,7 @@ int wl1271_ps_set_mode(struct wl1271 *wl, enum wl1271_cmd_ps_mode mode, case STATION_ACTIVE_MODE: default: wl1271_debug(DEBUG_PSM, "leaving psm"); - ret = wl1271_ps_elp_wakeup(wl, false); + ret = wl1271_ps_elp_wakeup(wl); if (ret < 0) return ret; |