diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2016-06-16 16:22:24 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-06-29 18:54:01 +0300 |
| commit | 437322ea2a36d112e20aa7282c869bf924b3a836 (patch) | |
| tree | 2ada8ff6534dc517977ff006a6ae84fcf381d229 /drivers/net/wireless/marvell/mwifiex/init.c | |
| parent | dec277f781cec519d96151bb740963b2a49f5f5d (diff) | |
| download | linux-437322ea2a36d112e20aa7282c869bf924b3a836.tar.xz | |
mwifiex: fix system hang problem after resume
On some platforms, driver is unable to wakeup firmware after system resume
due to a problem at MMC subsystem. Triggering card reset in this case has
a race with card removal from MMC which causes system hang. This patch
resolves the problem by not triggering card reset.
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/init.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c index a6d86d4ccd22..07eac5b195f0 100644 --- a/drivers/net/wireless/marvell/mwifiex/init.c +++ b/drivers/net/wireless/marvell/mwifiex/init.c @@ -60,7 +60,7 @@ static void wakeup_timer_fn(unsigned long data) adapter->hw_status = MWIFIEX_HW_STATUS_RESET; mwifiex_cancel_all_pending_cmd(adapter); - if (adapter->if_ops.card_reset) + if (adapter->if_ops.card_reset && !adapter->hs_activated) adapter->if_ops.card_reset(adapter); } |