diff --git a/[refs] b/[refs]
index 654548c80507..1fd9d2c9e9d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e638188b2b84ef9bb9ccbb87b92dda9d0a77bcb
+refs/heads/master: 5c30c76ee616fffb47cbd9810bfd0a99ce4ddb38
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-4965.c b/trunk/drivers/net/wireless/iwlegacy/iwl-4965.c
index 06dcee5c51aa..79e7ce643f71 100644
--- a/trunk/drivers/net/wireless/iwlegacy/iwl-4965.c
+++ b/trunk/drivers/net/wireless/iwlegacy/iwl-4965.c
@@ -915,7 +915,7 @@ static int iwl4965_fill_txpower_tbl(struct iwl_priv *priv, u8 band, u16 channel,
 	if (txatten_grp < 0) {
 		IWL_ERR(priv, "Can't find txatten group for channel %d.\n",
 			  channel);
-		return -EINVAL;
+		return txatten_grp;
 	}
 
 	IWL_DEBUG_TXPOWER(priv, "channel %d belongs to txatten group %d\n",