From d9509a9325d163c2bf9442618e2592cb53d37c6f Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Fri, 18 May 2012 20:22:53 +0200
Subject: [PATCH] --- yaml --- r: 309504 b: refs/heads/master c:
 edb9bc9a1e08f54adfdb4f4d31bca5a15aeb8ef0 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5ebe902fd49e..25f7cc424e4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 885ba1da689299ec52e646ca1a2429b8de55f364
+refs/heads/master: edb9bc9a1e08f54adfdb4f4d31bca5a15aeb8ef0
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 1d67ecf681b7..3e3524756263 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -28,6 +28,7 @@
 #include <linux/uaccess.h>
 #include <linux/firmware.h>
 #include <linux/usb.h>
+#include <linux/vmalloc.h>
 #include <net/cfg80211.h>
 
 #include <defs.h>
@@ -1239,7 +1240,7 @@ static int brcmf_usb_get_fw(struct brcmf_usbdev_info *devinfo)
 		return -EINVAL;
 	}
 
-	devinfo->image = kmalloc(fw->size, GFP_ATOMIC); /* plus nvram */
+	devinfo->image = vmalloc(fw->size); /* plus nvram */
 	if (!devinfo->image)
 		return -ENOMEM;
 
@@ -1602,7 +1603,7 @@ static struct usb_driver brcmf_usbdrvr = {
 void brcmf_usb_exit(void)
 {
 	usb_deregister(&brcmf_usbdrvr);
-	kfree(g_image.data);
+	vfree(g_image.data);
 	g_image.data = NULL;
 	g_image.len = 0;
 }