Commit 00d2ec0c authored Dec 14, 2011 by Larry Finger Committed by John W. Linville Dec 15, 2011

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>

parent 55e435de

drivers/net/wireless/brcm80211/brcmsmac/aiutils.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;