diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:15:43 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:15:43 -0500 |
| commit | bd2a81307487eba486f200423330d2403d0b893b (patch) | |
| tree | f15102f503619bcbd266acf650ade8b7b17f1c04 /net/mac80211/main.c | |
| parent | 6fe7cc71bbf3a0bc28c9cec3c00bc11e81344412 (diff) | |
| parent | 43c771a1963ab461a2f194e3c97fded1d5fe262f (diff) | |
| download | op-kernel-dev-bd2a81307487eba486f200423330d2403d0b893b.zip op-kernel-dev-bd2a81307487eba486f200423330d2403d0b893b.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index c80c449..f57f597 100644 --- a/net/mac80211/main.c +++ b/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 || |
