aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2015-01-30 03:40:04 -0500
committerKalle Valo <kvalo@codeaurora.org>2015-02-03 08:28:52 -0500
commitee6f0dd8a836311883fedfe060f23e0da2176950 (patch)
treeb6b25092f6250ea1e8230dec62ff95f22d63d75c /drivers/net/wireless/mwifiex
parent21b39ddb5bb2294fe64fbd29045591fe0707825f (diff)
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 <akarwar@marvell.com> Signed-off-by: Cathy Luo <cluo@marvell.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex')
-rw-r--r--drivers/net/wireless/mwifiex/sta_event.c3
1 files changed, 1 insertions, 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)
312 adapter->ps_state = PS_STATE_AWAKE; 312 adapter->ps_state = PS_STATE_AWAKE;
313 adapter->pm_wakeup_card_req = false; 313 adapter->pm_wakeup_card_req = false;
314 adapter->pm_wakeup_fw_try = false; 314 adapter->pm_wakeup_fw_try = false;
315 mod_timer(&adapter->wakeup_timer, 315 del_timer_sync(&adapter->wakeup_timer);
316 jiffies + (HZ*3));
317 break; 316 break;
318 } 317 }
319 if (!mwifiex_send_null_packet 318 if (!mwifiex_send_null_packet