diff options
Diffstat (limited to '0003-wifi.patch')
| -rw-r--r-- | 0003-wifi.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/0003-wifi.patch b/0003-wifi.patch index 587d799ea142..77e14cecf98f 100644 --- a/0003-wifi.patch +++ b/0003-wifi.patch @@ -271,3 +271,42 @@ index 0000000..e78d68c + return err; + } + +diff --git a/drivers/net/wireless/marvell/mwifiex/init.c b/drivers/net/wireless/marvell/mwifiex/init.c +index e11919db7..7f41cf8fe 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 && !adapter->hs_activated) ++ if (adapter->if_ops.card_reset) + adapter->if_ops.card_reset(adapter); + } + +diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c +index 3f2a88167..50df1c05f 100644 +--- a/drivers/net/wireless/marvell/mwifiex/pcie.c ++++ b/drivers/net/wireless/marvell/mwifiex/pcie.c +@@ -310,6 +310,8 @@ static void mwifiex_pcie_remove(struct pci_dev *pdev) + mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN); + } + ++ cancel_work_sync(&card->work); ++ + mwifiex_remove_card(adapter); + } + +diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c +index fd5183c10..832824a89 100644 +--- a/drivers/net/wireless/marvell/mwifiex/sdio.c ++++ b/drivers/net/wireless/marvell/mwifiex/sdio.c +@@ -399,6 +399,8 @@ mwifiex_sdio_remove(struct sdio_func *func) + mwifiex_init_shutdown_fw(priv, MWIFIEX_FUNC_SHUTDOWN); + } + ++ cancel_work_sync(&card->work); ++ + mwifiex_remove_card(adapter); + } + |