commit 7543710368958d90b50f454ee225a79451fce595
author Dmitry Shmidt <dimitrysh@google.com> Mon Jul 11 10:45:33 2011 -0700
committer Dmitry Shmidt <dimitrysh@google.com> Mon Jul 11 11:27:42 2011 -0700
tree b2c9c9fa89717a5112734c435ec3bf112c6a8a38
parent 8c3bcb428538007d88b0e76b1c2ce25e4c2ba0cf

net: wireless: bcmdhd: Fix CFG80211 suspend/resume if interface is down

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

drivers/net/wireless/bcmdhd/wl_cfg80211.c

diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
index 3196da3..d9c7e65 100644
--- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c
@@ -2594,10 +2594,16 @@
 
 static s32 wl_cfg80211_resume(struct wiphy *wiphy)
 {
+	struct wl_priv *wl = WL_PRIV_GET();
 	s32 err = 0;
 
-	CHECK_SYS_UP();
-	wl_invoke_iscan(WL_PRIV_GET());
+	if (unlikely(!test_bit(WL_STATUS_READY, &wl->status))) {
+		WL_INFO(("device is not ready : status (%d)\n",
+			(int)wl->status));
+		return 0;
+	}
+
+	wl_invoke_iscan(wl);
 
 	return err;
 }
@@ -2611,7 +2617,11 @@
 	struct wl_priv *wl = WL_PRIV_GET();
 	s32 err = 0;
 
-	CHECK_SYS_UP();
+	if (unlikely(!test_bit(WL_STATUS_READY, &wl->status))) {
+		WL_INFO(("device is not ready : status (%d)\n",
+			(int)wl->status));
+		return 0;
+	}
 
 	set_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
 	wl_term_iscan(wl);