diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-03-22 09:00:13 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:06:52 +0200 |
| commit | 3980686d6ccb1201b543a590fc31bc839157bb5b (patch) | |
| tree | e970dd57380b5178fdee7d8459f16aea5e69c1f2 | |
| parent | 99dc13f4e5ccbdb914f76e2fbf76e1a27c31df96 (diff) | |
cw1200: wakelock: Change for new Google wakelock implementation over PM sleep
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
| -rw-r--r-- | drivers/staging/cw1200/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/cw1200/pm.c b/drivers/staging/cw1200/pm.c index d95e5d3dc9e..98796cb2b0b 100644 --- a/drivers/staging/cw1200/pm.c +++ b/drivers/staging/cw1200/pm.c @@ -166,7 +166,7 @@ void cw1200_pm_stay_awake(struct cw1200_pm_state *pm, { long cur_tmo; spin_lock_bh(&pm->lock); - cur_tmo = pm->wakelock.expires - jiffies; + cur_tmo = pm->wakelock.ws.timer_expires - jiffies; if (!wake_lock_active(&pm->wakelock) || cur_tmo < (long)tmo) wake_lock_timeout(&pm->wakelock, tmo); |