summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2011-12-14 20:23:03 -0600
committerJohn W. Linville <linville@tuxdriver.com>2011-12-15 14:46:37 -0500
commit00d2ec0c5f5ae8507931efd8feb174f30370c12e (patch)
tree566a8007f815aa611a8d06770b1c828cb34cd291 /drivers/net/wireless/brcm80211
parent55e435de9153581fda21631f0e68bb793072234d (diff)
brcmsmac: Replace kmalloc/memset with kzalloc
In ai_attach(), space is allocated for an si_info struct. Immediately after the allocation, routine ai_doattach() is called and that allocated space is set to zero. As no other routine calls ai_doattach(), kzalloc() can be utilized. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Acked-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211')
-rw-r--r--drivers/net/wireless/brcm80211/brcmsmac/aiutils.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index 372bee8dd92..ab9bb11abfb 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -565,8 +565,6 @@ static struct si_info *ai_doattach(struct si_info *sii,
struct bcma_device *cc;
uint socitype;
- memset((unsigned char *) sii, 0, sizeof(struct si_info));
-
savewin = 0;
sii->icbus = pbus;
@@ -677,7 +675,7 @@ ai_attach(struct bcma_bus *pbus)
struct si_info *sii;
/* alloc struct si_info */
- sii = kmalloc(sizeof(struct si_info), GFP_ATOMIC);
+ sii = kzalloc(sizeof(struct si_info), GFP_ATOMIC);
if (sii == NULL)
return NULL;