mwifiex: cleanup wake-IRQ handling if suspend fails

We don't want to leave the wake IRQ enabled.

Signed-off-by: Brian Norris <[email protected]>
Signed-off-by: Amitkumar Karwar <[email protected]>
Signed-off-by: Kalle Valo <[email protected]>

diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 4b89f557d0b6d669b009b4044baad07cca12fe01..e4f1f5575975bd7c79bf687ca685fb469edb4f97 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -135,6 +135,7 @@ static int mwifiex_pcie_suspend(struct device *dev)
                mwifiex_dbg(adapter, ERROR,
                            "cmd: failed to suspend\n");
                adapter->hs_enabling = false;
+               mwifiex_disable_wake(adapter);
                return -EFAULT;
        }
 

diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c
index 0d00db5142e6cfcbe124ac3563fca3987b7db9f8..1235f04c0dd4c793ae906e980ac45c9eeb03914c 100644 (file)
--- a/drivers/net/wireless/marvell/mwifiex/sdio.c
+++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -298,6 +298,7 @@ static int mwifiex_sdio_suspend(struct device *dev)
                mwifiex_dbg(adapter, ERROR,
                            "cmd: failed to suspend\n");
                adapter->hs_enabling = false;
+               mwifiex_disable_wake(adapter);
                return -EFAULT;
        }