From 75beaf7033aa1fe8586e32f0afa1bcec35ce52fa Mon Sep 17 00:00:00 2001
From: Rajkumar Manoharan <rmanoharan@atheros.com>
Date: Tue, 1 Feb 2011 23:05:36 +0530
Subject: [PATCH] --- yaml --- r: 237019 b: refs/heads/master c:
 391bd1c443f70447616ce0e152f13daee5ca448f h: refs/heads/master i:   237017:
 5a810a686eca27ebeff5d8ea2ffaf459043ad9c9   237015:
 678ef9b8f17d20f02bc01b9e9705835b23aa295a v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/main.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index edbfc7bb5602..e7b5945ca135 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9d7732eafe38a717212648b7615399e68abb551
+refs/heads/master: 391bd1c443f70447616ce0e152f13daee5ca448f
diff --git a/trunk/drivers/net/wireless/ath/ath9k/main.c b/trunk/drivers/net/wireless/ath/ath9k/main.c
index c9925e943bc0..e5c695d73025 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/main.c
@@ -1419,9 +1419,7 @@ static void ath9k_do_vif_add_setup(struct ieee80211_hw *hw,
 		 * there.
 		 */
 		error = ath_beacon_alloc(sc, vif);
-		if (error)
-			ath9k_reclaim_beacon(sc, vif);
-		else
+		if (!error)
 			ath_beacon_config(sc, vif);
 	}
 }