From bc2736782a8cbe5d3db170f2ab3ed7a0f0238119 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Mon, 19 Nov 2012 10:53:32 -0500
Subject: [PATCH] --- yaml --- r: 341534 b: refs/heads/master c:
 5b15d0f449036b0674c5214296572f53974c22ac h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 372b7fc6fbbd..abc0b8303f86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9242c7261b8c05de71fb83f2fa7a299691c66977
+refs/heads/master: 5b15d0f449036b0674c5214296572f53974c22ac
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
index 1e4188cc1b5a..fa8fc4433417 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
@@ -494,6 +494,9 @@ void brcmf_fweh_process_event(struct brcmf_pub *drvr,
 		alloc_flag = GFP_ATOMIC;
 
 	event = kzalloc(sizeof(*event) + datalen, alloc_flag);
+	if (!event)
+		return;
+
 	event->code = code;
 	event->ifidx = *ifidx;