From ee6f0dd8a836311883fedfe060f23e0da2176950 Mon Sep 17 00:00:00 2001 From: Amitkumar Karwar Date: Fri, 30 Jan 2015 00:40:04 -0800 Subject: [PATCH] mwifiex: correction in wakeup timer handling Wakeup timer is in sync with 'pm_wakeup_fw_try' flag. It has been started instead of cancelling at one place. This patch corrects it. Signed-off-by: Amitkumar Karwar Signed-off-by: Cathy Luo Signed-off-by: Kalle Valo --- drivers/net/wireless/mwifiex/sta_event.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c index c03b82c2fe1c..80ffe7412496 100644 --- a/drivers/net/wireless/mwifiex/sta_event.c +++ b/drivers/net/wireless/mwifiex/sta_event.c @@ -312,8 +312,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv) adapter->ps_state = PS_STATE_AWAKE; adapter->pm_wakeup_card_req = false; adapter->pm_wakeup_fw_try = false; - mod_timer(&adapter->wakeup_timer, - jiffies + (HZ*3)); + del_timer_sync(&adapter->wakeup_timer); break; } if (!mwifiex_send_null_packet -- 2.11.0