From f031c57dcb479fb09cfa270a0e521dcc1fe18273 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Mon, 14 Jul 2008 12:52:08 -0700
Subject: [PATCH] --- yaml --- r: 107107 b: refs/heads/master c:
 023a04bebe7030c1e6d5347bd3f27a3e49a1f222 h: refs/heads/master i:   107105:
 b6ec97734af4f7b947c18dcccd7a842f650fe003   107103:
 c01151bce514e5bf31d1e955f1414e252426b01e v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/main.c | 4 ++--
 trunk/net/mac80211/wep.c  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 72e2900b157e..13d191d35bf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b0241656b658522a15e7aad570cb8ea6b255a2a
+refs/heads/master: 023a04bebe7030c1e6d5347bd3f27a3e49a1f222
diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c
index f1a83d450ea0..b5830f7055cf 100644
--- a/trunk/net/mac80211/main.c
+++ b/trunk/net/mac80211/main.c
@@ -1731,8 +1731,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)
 	result = ieee80211_wep_init(local);
 
 	if (result < 0) {
-		printk(KERN_DEBUG "%s: Failed to initialize wep\n",
-		       wiphy_name(local->hw.wiphy));
+		printk(KERN_DEBUG "%s: Failed to initialize wep: %d\n",
+		       wiphy_name(local->hw.wiphy), result);
 		goto fail_wep;
 	}
 
diff --git a/trunk/net/mac80211/wep.c b/trunk/net/mac80211/wep.c
index 872d2fcd1a5b..5c2bf0a3d4db 100644
--- a/trunk/net/mac80211/wep.c
+++ b/trunk/net/mac80211/wep.c
@@ -31,13 +31,13 @@ int ieee80211_wep_init(struct ieee80211_local *local)
 	local->wep_tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
 						CRYPTO_ALG_ASYNC);
 	if (IS_ERR(local->wep_tx_tfm))
-		return -ENOMEM;
+		return PTR_ERR(local->wep_tx_tfm);
 
 	local->wep_rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0,
 						CRYPTO_ALG_ASYNC);
 	if (IS_ERR(local->wep_rx_tfm)) {
 		crypto_free_blkcipher(local->wep_tx_tfm);
-		return -ENOMEM;
+		return PTR_ERR(local->wep_rx_tfm);
 	}
 
 	return 0;