diff options
| author | Brian Norris | 2016-11-18 18:13:24 +0100 |
|---|---|---|
| committer | Kalle Valo | 2016-11-25 10:49:55 +0100 |
| commit | d96e39270ba5b81dee63f7a1bdaad01484c94e08 (patch) | |
| tree | 1ad469d65a7b8e5ac62c2af2a16c4984288cf570 /drivers/net/wireless/marvell | |
| parent | rsi: Add support for 802.11d (diff) | |
| download | kernel-qcow2-linux-d96e39270ba5b81dee63f7a1bdaad01484c94e08.tar.gz kernel-qcow2-linux-d96e39270ba5b81dee63f7a1bdaad01484c94e08.tar.xz kernel-qcow2-linux-d96e39270ba5b81dee63f7a1bdaad01484c94e08.zip | |
mwifiex: cleanup wake-IRQ handling if suspend fails
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>
Diffstat (limited to 'drivers/net/wireless/marvell')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/pcie.c | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/sdio.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 4b89f557d0b6..e4f1f5575975 100644 --- 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 0d00db5142e6..1235f04c0dd4 100644 --- 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; } |