diff mbox

[1/4] mwifiex: correction in wakeup timer handling

Message ID 1422607207-15229-1-git-send-email-akarwar@marvell.com (mailing list archive)
State Accepted
Delegated to: Kalle Valo
Headers show

Commit Message

Amitkumar Karwar Jan. 30, 2015, 8:40 a.m. UTC 
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>
---
 drivers/net/wireless/mwifiex/sta_event.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Kalle Valo Feb. 3, 2015, 1:29 p.m. UTC | #1 
> 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>

Thanks, 4 patches applied to wireless-drivers-next.git:

ee6f0dd8a836 mwifiex: correction in wakeup timer handling
7a1f4e61eb64 mwifiex: fix memory leak in mwifiex_send_processed_packet()
0ea3186ce03c mwifiex: fix NULL packet downloading issues
fc8f0456dcce mwifiex: disable UAPSD mode when AP starts

Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

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