From 3980686d6ccb1201b543a590fc31bc839157bb5b Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Thu, 22 Mar 2012 09:00:13 +0100 Subject: cw1200: wakelock: Change for new Google wakelock implementation over PM sleep Signed-off-by: Philippe Langlais --- drivers/staging/cw1200/pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- cgit v1.2.3