mac80211: Don't squash error codes in key setup functions

[pandora-kernel.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 29ac8e1..19c6146 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -150,8 +150,8 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev,
 
        key = ieee80211_key_alloc(alg, key_idx, params->key_len, params->key,
                                  params->seq_len, params->seq);
-       if (!key)
-               return -ENOMEM;
+       if (IS_ERR(key))
+               return PTR_ERR(key);
 
        mutex_lock(&sdata->local->sta_mtx);