Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e9344fd authored Mar 12, 2015 by Amitkumar Karwar Committed by Kalle Valo Mar 16, 2015

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>

parent b533be18

drivers/net/wireless/mwifiex/main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -247,7 +247,7 @@ int mwifiex_main_process(struct mwifiex_adapter *adapter)
	if (IS_CARD_RX_RCVD(adapter)) {		if (IS_CARD_RX_RCVD(adapter)) {
	adapter->data_received = false;		adapter->data_received = false;
	adapter->pm_wakeup_fw_try = 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)		if (adapter->ps_state == PS_STATE_SLEEP)
	adapter->ps_state = PS_STATE_AWAKE;		adapter->ps_state = PS_STATE_AWAKE;
	} else {		} else {

drivers/net/wireless/mwifiex/sta_event.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -312,7 +312,7 @@ int mwifiex_process_sta_event(struct mwifiex_private *priv)
	adapter->ps_state = PS_STATE_AWAKE;		adapter->ps_state = PS_STATE_AWAKE;
	adapter->pm_wakeup_card_req = false;		adapter->pm_wakeup_card_req = false;
	adapter->pm_wakeup_fw_try = false;		adapter->pm_wakeup_fw_try = false;
	del_timer_sync(&adapter->wakeup_timer);		del_timer(&adapter->wakeup_timer);
	break;		break;
	}		}
	if (!mwifiex_send_null_packet		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->ps_state = PS_STATE_AWAKE;
	adapter->pm_wakeup_card_req = false;		adapter->pm_wakeup_card_req = false;
	adapter->pm_wakeup_fw_try = false;		adapter->pm_wakeup_fw_try = false;
	del_timer_sync(&adapter->wakeup_timer);		del_timer(&adapter->wakeup_timer);

	break;		break;

drivers/net/wireless/mwifiex/usb.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1006,7 +1006,7 @@ static int mwifiex_pm_wakeup_card(struct mwifiex_adapter *adapter)
	{		{
	/* Simulation of HS_AWAKE event */		/* Simulation of HS_AWAKE event */
	adapter->pm_wakeup_fw_try = false;		adapter->pm_wakeup_fw_try = false;
	del_timer_sync(&adapter->wakeup_timer);		del_timer(&adapter->wakeup_timer);
	adapter->pm_wakeup_card_req = false;		adapter->pm_wakeup_card_req = false;
	adapter->ps_state = PS_STATE_AWAKE;		adapter->ps_state = PS_STATE_AWAKE;