1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index d7a74597fd59..357dc9d99945 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -1610,10 +1610,13 @@ static struct notifier_block wl1271_dev_notifier = {
 #ifdef CONFIG_PM
 static int wl1271_configure_suspend_sta(struct wl1271 *wl)
 {
-        int ret;
+        int ret = 0;
 
         mutex_lock(&wl->mutex);
 
+        if (!test_bit(WL1271_FLAG_STA_ASSOCIATED, &wl->flags))
+                goto out_unlock;
+
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out_unlock;
@@ -1658,10 +1661,13 @@ out:
 
 static int wl1271_configure_suspend_ap(struct wl1271 *wl)
 {
-        int ret;
+        int ret = 0;
 
         mutex_lock(&wl->mutex);
 
+        if (!test_bit(WL1271_FLAG_AP_STARTED, &wl->flags))
+                goto out_unlock;
+
         ret = wl1271_ps_elp_wakeup(wl);
         if (ret < 0)
                 goto out_unlock;