Message ID | 1479489205-30288-1-git-send-email-akarwar@marvell.com (mailing list archive) |
---|---|
State | Accepted |
Commit | d96e39270ba5b81dee63f7a1bdaad01484c94e08 |
Delegated to: | Kalle Valo |
Headers | show |
Amitkumar Karwar <akarwar@marvell.com> wrote: > From: Brian Norris <briannorris@chromium.org> > > 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> 2 patches applied to wireless-drivers-next.git, thanks. d96e39270ba5 mwifiex: cleanup wake-IRQ handling if suspend fails b9da4d223bda mwifiex: avoid double-disable_irq() race
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c index 62ec141..32fa4ed 100644 --- a/drivers/net/wireless/marvell/mwifiex/pcie.c +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c @@ -137,6 +137,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 c219671..78f2cc9 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c @@ -308,6 +308,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; }