From bf282f73db9d4d8f914fa886b38751942f3c84e6 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Wed, 12 Jan 2011 13:21:19 -0800
Subject: [PATCH] --- yaml --- r: 235607 b: refs/heads/master c:
 0bbfc0edb7a2606829dfcb5c6926f20adfc68d91 h: refs/heads/master i:   235605:
 b8ed426b8a4bea67e114f4ac05d0b31b435244b5   235603:
 368de3085c0735b2f0d292dabca4b403f8322542   235599:
 34b4c547e994849d71740bf00a0c3d1b80d6bc11 v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 858255a24eb1..e4b4683ce59e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eee3a678835fbf8f8a5a243c7bf69d9f990a70fd
+refs/heads/master: 0bbfc0edb7a2606829dfcb5c6926f20adfc68d91
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 55b9ceee4200..6a552bd5c90b 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -703,7 +703,6 @@ wl_run_iscan(struct wl_iscan_ctrl *iscan, struct wlc_ssid *ssid, u16 action)
 	params = kzalloc(params_size, GFP_KERNEL);
 	if (unlikely(!params))
 		return -ENOMEM;
-	memset(params, 0, params_size);
 	BUG_ON(unlikely(params_size >= WLC_IOCTL_SMLEN));
 
 	wl_iscan_prep(&params->params, ssid);