From 2b2217bd5eab693d6f05e10e716bbcd6e230d063 Mon Sep 17 00:00:00 2001
From: Larry Finger <Larry.Finger@lwfinger.net>
Date: Sat, 27 Aug 2011 13:56:00 -0500
Subject: [PATCH] --- yaml --- r: 265899 b: refs/heads/master c:
 1ba45b9e3a366fee0603cda51e61935b7dc9db7d h: refs/heads/master i:   265897:
 f72933bc6b3d77cbfc5cec24c2f43c60a0bb3298   265895:
 cf446f5a7959fa83575b4e12976a03d807186ad3 v: v3

---
 [refs]                                               | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +-
 trunk/drivers/net/wireless/ath/ath9k/htc_drv_main.c  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f6cf81d514c..e8a4b5289fc4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf3af74824b1bf2bd60eb6a0dd82b27f9e9236ac
+refs/heads/master: 1ba45b9e3a366fee0603cda51e61935b7dc9db7d
diff --git a/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 908463915b99..cb4c32eaef61 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -3318,7 +3318,7 @@ static int ar9300_eeprom_restore_internal(struct ath_hw *ah,
 
 	word = kzalloc(2048, GFP_KERNEL);
 	if (!word)
-		return -1;
+		return -ENOMEM;
 
 	memcpy(mptr, &ar9300_default, mdata_size);
 
diff --git a/trunk/drivers/net/wireless/ath/ath9k/htc_drv_main.c b/trunk/drivers/net/wireless/ath/ath9k/htc_drv_main.c
index 0248024da56a..b9de1511add9 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/htc_drv_main.c
@@ -1300,6 +1300,7 @@ static void ath9k_htc_configure_filter(struct ieee80211_hw *hw,
 	if (priv->op_flags & OP_INVALID) {
 		ath_dbg(ath9k_hw_common(priv->ah), ATH_DBG_ANY,
 			"Unable to configure filter on invalid state\n");
+		mutex_unlock(&priv->mutex);
 		return;
 	}
 	ath9k_htc_ps_wakeup(priv);