From bf48b921916d04a3c23d527452ac167ac121f7a3 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 9 Nov 2012 09:47:27 +0100 Subject: [PATCH] --- yaml --- r: 335768 b: refs/heads/master c: cfff2f999d9baa561f20d999c8b83b03f078fb8f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 496c25817665..c61ba56205d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 987c285c2ae2e4e32aca3a9b3252d28171c75711 +refs/heads/master: cfff2f999d9baa561f20d999c8b83b03f078fb8f diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index c80c4490351c..f57f597972f8 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/net/mac80211/main.c @@ -871,8 +871,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) local->hw.wiphy->cipher_suites, sizeof(u32) * local->hw.wiphy->n_cipher_suites, GFP_KERNEL); - if (!suites) - return -ENOMEM; + if (!suites) { + result = -ENOMEM; + goto fail_wiphy_register; + } for (r = 0; r < local->hw.wiphy->n_cipher_suites; r++) { u32 suite = local->hw.wiphy->cipher_suites[r]; if (suite == WLAN_CIPHER_SUITE_WEP40 ||