---

yaml --- r: 327519 b: refs/heads/master c: 126f492 h: refs/heads/master i: 327517: c2b26d9 327515: 3468a03 327511: 0768357 327503: 1b6e62a 327487: ea26d1a v: v3
git-mirror · Aug 10, 2012 · 7bf960d · 7bf960d
1 parent 1743ed4
commit 7bf960d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c7ff737b6a783a6641dca71fab4f94aaab4bb2a
+refs/heads/master: 126f492355be8c771338b680b3dfbb38a19c88ab
diff --git a/trunk/drivers/net/wireless/mwifiex/uap_event.c b/trunk/drivers/net/wireless/mwifiex/uap_event.c
@@ -63,7 +63,7 @@ mwifiex_add_sta_entry(struct mwifiex_private *priv, u8 *mac)
 	if (node)
 		goto done;
 
-	node = kzalloc(sizeof(struct mwifiex_sta_node), GFP_KERNEL);
+	node = kzalloc(sizeof(struct mwifiex_sta_node), GFP_ATOMIC);
 	if (!node)
 		goto done;