summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorArik Nemtsov <arik@wizery.com>2012-06-21 15:10:47 (GMT)
committerLuciano Coelho <coelho@ti.com>2012-06-22 19:54:14 (GMT)
commit96caded8d275f67c6000fa219b0c11e7d6bf8e0b (patch)
treed6122d60034497337d9733ff00967304bca50879 /drivers
parente1262efb9bf9864532c0dfca2b2e222aee7bd0a5 (diff)
downloadlinux-fsl-qoriq-96caded8d275f67c6000fa219b0c11e7d6bf8e0b.tar.xz
wlcore: cancel suspend when recovery is pending
We wish to postpone suspend if recovery is pending. This will make sure the FW is in a good state and perform wowlan wakeup. Signed-off-by: Arik Nemtsov <arik@wizery.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/wireless/ti/wlcore/main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index b0795aa..0df28d5 100644
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -1661,6 +1661,12 @@ static int wl1271_op_suspend(struct ieee80211_hw *hw,
wl1271_debug(DEBUG_MAC80211, "mac80211 suspend wow=%d", !!wow);
WARN_ON(!wow);
+ /* we want to perform the recovery before suspending */
+ if (test_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags)) {
+ wl1271_warning("postponing suspend to perform recovery");
+ return -EBUSY;
+ }
+
wl1271_tx_flush(wl);
mutex_lock(&wl->mutex);