---

yaml --- r: 335768 b: refs/heads/master c: cfff2f9 h: refs/heads/master v: v3
git-mirror · Nov 9, 2012 · bf48b92 · bf48b92
1 parent 0011adc
commit bf48b92
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 ||