From: Amitkumar Karwar <akarwar@marvell.com>
Date: Fri, 30 Jan 2015 08:40:04 +0000 (-0800)
Subject: mwifiex: correction in wakeup timer handling
X-Git-Tag: v4.14-rc1~5989^2~10^2~47
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee6f0dd8a836311883fedfe060f23e0da2176950;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
index c03b82c..80ffe741 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