From bed37d82b04cb684d029f505ba5277a404c5b15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 27 Mar 2011 13:31:26 +0200 Subject: [PATCH] --- yaml --- r: 243694 b: refs/heads/master c: 1f951a7f8ba05192291f781ef99a892697e47d62 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/key.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1ce584d73526..b87dc8fdcbaf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f62d816fc4324afbb7cf90110c70b6a14139b225 +refs/heads/master: 1f951a7f8ba05192291f781ef99a892697e47d62 diff --git a/trunk/net/mac80211/key.c b/trunk/net/mac80211/key.c index 8c02469b7176..09cf1f28c12b 100644 --- a/trunk/net/mac80211/key.c +++ b/trunk/net/mac80211/key.c @@ -342,7 +342,7 @@ struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len, if (IS_ERR(key->u.ccmp.tfm)) { err = PTR_ERR(key->u.ccmp.tfm); kfree(key); - key = ERR_PTR(err); + return ERR_PTR(err); } break; case WLAN_CIPHER_SUITE_AES_CMAC: @@ -360,7 +360,7 @@ struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len, if (IS_ERR(key->u.aes_cmac.tfm)) { err = PTR_ERR(key->u.aes_cmac.tfm); kfree(key); - key = ERR_PTR(err); + return ERR_PTR(err); } break; }