From 9bd787286ee618b40b16b799f5eb94ca16db92bc Mon Sep 17 00:00:00 2001
From: Saravanan Dhanabal <ext-saravanan.dhanabal@nokia.com>
Date: Fri, 9 Apr 2010 11:07:28 +0300
Subject: [PATCH] --- yaml --- r: 194242 b: refs/heads/master c:
 aecb0565e3e331d4dd23b4d35180519532015f22 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0d6d6e8e41d..9464863cfd2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c10bb9cb3f9cecb71bd2cbb771778136433ebe2
+refs/heads/master: aecb0565e3e331d4dd23b4d35180519532015f22
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
index 2eb7b99ff276..4adc5162e7e5 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1582,10 +1582,13 @@ static int wl1271_op_hw_scan(struct ieee80211_hw *hw,
 static int wl1271_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value)
 {
 	struct wl1271 *wl = hw->priv;
-	int ret;
+	int ret = 0;
 
 	mutex_lock(&wl->mutex);
 
+	if (unlikely(wl->state == WL1271_STATE_OFF))
+		goto out;
+
 	ret = wl1271_ps_elp_wakeup(wl, false);
 	if (ret < 0)
 		goto out;