summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/mwifiex/main.c
diff options
context:
space:
mode:
authorAmitkumar Karwar <akarwar@marvell.com>2015-03-12 00:38:40 -0700
committerKalle Valo <kvalo@codeaurora.org>2015-03-16 18:05:01 +0200
commit6e9344fd8e90ff0bd8e74c15ec7c21eae7d54bd3 (patch)
tree477761d30bb190d24061a4f2d5a04111b8fbdc9e /drivers/net/wireless/mwifiex/main.c
parentb533be189732e93c6d3306773b7120722568444d (diff)
downloadop-kernel-dev-6e9344fd8e90ff0bd8e74c15ec7c21eae7d54bd3.zip
op-kernel-dev-6e9344fd8e90ff0bd8e74c15ec7c21eae7d54bd3.tar.gz
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>
Diffstat (limited to 'drivers/net/wireless/mwifiex/main.c')
-rw-r--r--drivers/net/wireless/mwifiex/main.c2
1 files changed, 1 insertions, 1 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 {
OpenPOWER on IntegriCloud