69 lines
2.6 KiB
Diff
69 lines
2.6 KiB
Diff
From 6e9344fd8e90ff0bd8e74c15ec7c21eae7d54bd3 Mon Sep 17 00:00:00 2001
|
|
From: Amitkumar Karwar <akarwar@marvell.com>
|
|
Date: Thu, 12 Mar 2015 00:38:40 -0700
|
|
Subject: [PATCH] mwifiex: use del_timer variant in interrupt context
|
|
|
|
We might be in interrupt context at few places. So replace
|
|
del_timer_sync() with del_timer(). This patch fixes a kernel
|
|
trace problem seen occasionally during our testing.
|
|
|
|
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/mwifiex/main.c | 2 +-
|
|
drivers/net/wireless/mwifiex/sta_event.c | 4 ++--
|
|
drivers/net/wireless/mwifiex/usb.c | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c
|
|
index 74488ab..42bf884 100644
|
|
--- a/drivers/net/wireless/mwifiex/main.c
|
|
+++ b/drivers/net/wireless/mwifiex/main.c
|
|
@@ -247,7 +247,7 @@ process_start:
|
|
if (IS_CARD_RX_RCVD(adapter)) {
|
|
adapter->data_received = false;
|
|
adapter->pm_wakeup_fw_try = false;
|
|
- del_timer_sync(&adapter->wakeup_timer);
|
|
+ del_timer(&adapter->wakeup_timer);
|
|
if (adapter->ps_state == PS_STATE_SLEEP)
|
|
adapter->ps_state = PS_STATE_AWAKE;
|
|
} else {
|
|
diff --git a/drivers/net/wireless/mwifiex/sta_event.c b/drivers/net/wireless/mwifiex/sta_event.c
|
|
index 64c4223..0dc7a1d 100644
|
|
--- a/drivers/net/wireless/mwifiex/sta_event.c
|
|
+++ b/drivers/net/wireless/mwifiex/sta_event.c
|
|
@@ -312,7 +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;
|
|
- del_timer_sync(&adapter->wakeup_timer);
|
|
+ del_timer(&adapter->wakeup_timer);
|
|
break;
|
|
}
|
|
if (!mwifiex_send_null_packet
|
|
@@ -327,7 +327,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;
|
|
- del_timer_sync(&adapter->wakeup_timer);
|
|
+ del_timer(&adapter->wakeup_timer);
|
|
|
|
break;
|
|
|
|
diff --git a/drivers/net/wireless/mwifiex/usb.c b/drivers/net/wireless/mwifiex/usb.c
|
|
index 2238730..8beb38c 100644
|
|
--- a/drivers/net/wireless/mwifiex/usb.c
|
|
+++ b/drivers/net/wireless/mwifiex/usb.c
|
|
@@ -1006,7 +1006,7 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
|
|
{
|
|
/* Simulation of HS_AWAKE event */
|
|
adapter->pm_wakeup_fw_try = false;
|
|
- del_timer_sync(&adapter->wakeup_timer);
|
|
+ del_timer(&adapter->wakeup_timer);
|
|
adapter->pm_wakeup_card_req = false;
|
|
adapter->ps_state = PS_STATE_AWAKE;
|
|
|
|
--
|
|
2.4.1
|
|
|