From 242fb4d0339ac9dd852ac0e5b3488e1ba02db684 Mon Sep 17 00:00:00 2001
From: Nick Kossifidis <mick@madwifi-project.org>
Date: Mon, 9 Feb 2009 06:17:45 +0200
Subject: [PATCH] --- yaml --- r: 134463 b: refs/heads/master c:
 fa8419d08e58c82add921b4e4eb01eb589b8586b h: refs/heads/master i:   134461:
 619cc43c2d39351a8382e1ac67c78e91d5f68565   134459:
 13b8a327e063ac7b4f8815499ad932d76ce7233b   134455:
 d2494752c02b8df10a8b9247e4e398cfaa9ae219   134447:
 70dc2410e52f4039aeb18723fb3dfa1aadb987bb   134431:
 0dea42c5ea9d53a3be6add4a5cfcc2e43403cfa0   134399:
 feca9023d7a065e36e460f301c03ef18425283ba v: v3

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

diff --git a/[refs] b/[refs]
index ea4848401bbe..a516aa4a8004 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e3e6e8fe2f422f75619b1110f78bb638ae905b9
+refs/heads/master: fa8419d08e58c82add921b4e4eb01eb589b8586b
diff --git a/trunk/drivers/net/wireless/ath5k/base.c b/trunk/drivers/net/wireless/ath5k/base.c
index 3d36e84b1e05..6837ca9f3831 100644
--- a/trunk/drivers/net/wireless/ath5k/base.c
+++ b/trunk/drivers/net/wireless/ath5k/base.c
@@ -2884,7 +2884,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 {
 	struct ath5k_softc *sc = hw->priv;
 	struct ath5k_hw *ah = sc->ah;
-	int ret;
+	int ret = 0;
 
 	mutex_lock(&sc->lock);
 	if (sc->vif != vif) {
@@ -2910,9 +2910,7 @@ ath5k_config_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 		}
 		ath5k_beacon_update(sc, beacon);
 	}
-	mutex_unlock(&sc->lock);
 
-	return ath5k_reset_wake(sc);
 unlock:
 	mutex_unlock(&sc->lock);
 	return ret;