From dec96df19ae7418617568e56ad15d527c2f77e39 Mon Sep 17 00:00:00 2001
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Fri, 11 Dec 2009 15:41:10 +0200
Subject: [PATCH] --- yaml --- r: 183387 b: refs/heads/master c:
 8f648c00039a42e67a9dff034c77d41502dab1f3 h: refs/heads/master i:   183385:
 109dadd559e6f1851c92a8c564fe2d8f4753b2da   183383:
 c2180a69f1d2cbe9057bcd9fb0703318346d23eb v: v3

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

diff --git a/[refs] b/[refs]
index 701ebd3290f8..2ee39a0e46c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04477bf095afd008b73717f7a4ea1fdf18b1b5e2
+refs/heads/master: 8f648c00039a42e67a9dff034c77d41502dab1f3
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
index 7e6b500dfb6f..4a997381a8d0 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1223,7 +1223,7 @@ static int wl1271_op_config(struct ieee80211_hw *hw, u32 changed)
 		if (conf->flags & IEEE80211_CONF_IDLE &&
 		    test_bit(WL1271_FLAG_JOINED, &wl->flags))
 			wl1271_unjoin_channel(wl);
-		else
+		else if (!(conf->flags & IEEE80211_CONF_IDLE))
 			wl1271_join_channel(wl, channel);
 
 		if (conf->flags & IEEE80211_CONF_IDLE) {