diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2015-01-30 00:40:04 -0800 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-02-03 15:28:52 +0200 |
| commit | ee6f0dd8a836311883fedfe060f23e0da2176950 (patch) | |
| tree | b6b25092f6250ea1e8230dec62ff95f22d63d75c /drivers/net/wireless | |
| parent | 21b39ddb5bb2294fe64fbd29045591fe0707825f (diff) | |
| download | blackbird-op-linux-ee6f0dd8a836311883fedfe060f23e0da2176950.tar.gz blackbird-op-linux-ee6f0dd8a836311883fedfe060f23e0da2176950.zip | |
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')
| -rw-r--r-- | drivers/net/wireless/mwifiex/sta_event.c | 3 |
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) 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 |
