---

yaml --- r: 289949 b: refs/heads/master c: 75ac9a2 h: refs/heads/master i: 289947: 2bfc1a9 v: v3
git-mirror · Jan 24, 2012 · 6289505 · 6289505
1 parent 72924a3
commit 6289505
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: 11ee51589a61fa836b1540293ad6c7dfd7de544a
+refs/heads/master: 75ac9a28a0c6b818ba1aba874b6b3ae17241552c
diff --git a/trunk/drivers/net/wireless/mwifiex/scan.c b/trunk/drivers/net/wireless/mwifiex/scan.c
@@ -2001,7 +2001,7 @@ mwifiex_save_curr_bcn(struct mwifiex_private *priv)
 
 		kfree(priv->curr_bcn_buf);
 		priv->curr_bcn_buf = kmalloc(curr_bss->beacon_buf_size,
-						GFP_KERNEL);
+						GFP_ATOMIC);
 		if (!priv->curr_bcn_buf) {
 			dev_err(priv->adapter->dev,
 					"failed to alloc curr_bcn_buf\n");