projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 61d1084)
mwifiex: cleanup wake-IRQ handling if suspend fails
authorBrian Norris <briannorris@chromium.org>
Fri, 18 Nov 2016 17:13:24 +0000 (22:43 +0530)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 25 Nov 2016 09:49:55 +0000 (11:49 +0200)
We don't want to leave the wake IRQ enabled.

Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/marvell/mwifiex/pcie.c patch | blob | blame | history
drivers/net/wireless/marvell/mwifiex/sdio.c patch | blob | blame | history

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;
        }