diff --git a/[refs] b/[refs]
index dddead212806..82c1a2a911e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fe4dffbc12b22507d2416667720cbd4b27c693b
+refs/heads/master: 68469341f32b566481bfccb776ee03146b63bae5
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/main.c b/trunk/drivers/net/wireless/ath/ath6kl/main.c
index 717ed22abc31..def0b7f29c37 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/main.c
+++ b/trunk/drivers/net/wireless/ath/ath6kl/main.c
@@ -1147,7 +1147,6 @@ static int ath6kl_close(struct net_device *dev)
 					      0, 0, 0, 0, 0, 0, 0, 0, 0))
 			return -EIO;
 
-		clear_bit(WLAN_ENABLED, &vif->flags);
 	}
 
 	ath6kl_cfg80211_scan_complete_event(vif, -ECANCELED);
@@ -1157,6 +1156,8 @@ static int ath6kl_close(struct net_device *dev)
 	if (ret)
 		return ret;
 
+	clear_bit(WLAN_ENABLED, &vif->flags);
+
 	return 0;
 }