From 7369bce7c152e3469d11518579b05b25ac094395 Mon Sep 17 00:00:00 2001 From: Kalle Valo Date: Mon, 30 Nov 2009 10:18:06 +0200 Subject: [PATCH] --- yaml --- r: 183261 b: refs/heads/master c: 7fa6282a1775bd41508220e65ba0cb92235b67d4 h: refs/heads/master i: 183259: 48af4f0071847eca95ef20bf32f37996f4b7c2f8 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/wl1251_ps.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index de96623f6d79..fc7ea25a6703 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5a167942cb388cc5f1a6085cb3506d5bf47517d +refs/heads/master: 7fa6282a1775bd41508220e65ba0cb92235b67d4 diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c b/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c index 54a27200f3b6..851dfb65e474 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c +++ b/trunk/drivers/net/wireless/wl12xx/wl1251_ps.c @@ -68,7 +68,7 @@ void wl1251_ps_elp_sleep(struct wl1251 *wl) int wl1251_ps_elp_wakeup(struct wl1251 *wl) { - unsigned long timeout; + unsigned long timeout, start; u32 elp_reg; if (!wl->elp) @@ -76,6 +76,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl) wl1251_debug(DEBUG_PSM, "waking up chip from elp"); + start = jiffies; timeout = jiffies + msecs_to_jiffies(WL1251_WAKEUP_TIMEOUT); wl1251_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, ELPCTRL_WAKE_UP); @@ -96,8 +97,7 @@ int wl1251_ps_elp_wakeup(struct wl1251 *wl) } wl1251_debug(DEBUG_PSM, "wakeup time: %u ms", - jiffies_to_msecs(jiffies) - - (jiffies_to_msecs(timeout) - WL1251_WAKEUP_TIMEOUT)); + jiffies_to_msecs(jiffies - start)); wl->elp = false;