From 4b7d764fa7c575cdfa5be4e698bda24d8773f3c4 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 1 Apr 2011 16:23:42 +0200
Subject: [PATCH] --- yaml --- r: 249083 b: refs/heads/master c:
 60d5c9f5b6a2f5ce09712b7f7d0b0bf979a150be h: refs/heads/master i:   249081:
 7786f2ce926707bf24498b761af9dea5575a4937   249079:
 7e23ca6d1918204dfa101da6896f352108a3ace8 v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d6dece5f37ec..03fec17cb491 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29811f9d8973e65b46da4283d52f02f78a21f6e0
+refs/heads/master: 60d5c9f5b6a2f5ce09712b7f7d0b0bf979a150be
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index b49957fb7586..4e4cf36af51c 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -3672,8 +3672,10 @@ int wl_iw_attach(struct net_device *dev, void *dhdp)
 		return -ENOMEM;
 
 	iscan->iscan_ex_params_p = kmalloc(params_size, GFP_KERNEL);
-	if (!iscan->iscan_ex_params_p)
+	if (!iscan->iscan_ex_params_p) {
+		kfree(iscan);
 		return -ENOMEM;
+	}
 	iscan->iscan_ex_param_size = params_size;
 	iscan->sysioc_tsk = NULL;