---

yaml --- r: 194242 b: refs/heads/master c: aecb056 h: refs/heads/master v: v3
git-mirror · Apr 9, 2010 · 9bd7872 · 9bd7872
1 parent 4524957
commit 9bd7872
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;