From 7bf960de29f688ec5fb8954b49d691cfff38ca11 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Thu, 9 Aug 2012 09:57:57 +0300
Subject: [PATCH] --- yaml --- r: 327519 b: refs/heads/master c:
 126f492355be8c771338b680b3dfbb38a19c88ab h: refs/heads/master i:   327517:
 c2b26d9781c327c69285125409928ca71d979b8b   327515:
 3468a03942203d9495f7393b81662c2df7394a0f   327511:
 0768357c69fb16c2503b70835b18028b52e64b52   327503:
 1b6e62a7f9dc7705e188b5e7eae59e35ba178ac7   327487:
 ea26d1a695a77bb551d8ff9ffdccf81346a0620b v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/wireless/mwifiex/uap_event.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c2779bd4890c..c87704e57200 100644
--- 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
index 1703abf73dac..a33fa394e349 100644
--- 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;