---

yaml --- r: 267507 b: refs/heads/master c: 5349d3d h: refs/heads/master i: 267505: 6a47f9f 267503: ee4fe0b v: v3
git-mirror · Aug 23, 2011 · c10349a · c10349a
1 parent f13ab7b
commit c10349a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a84d6ad4c9306afb467a600a4c6d7b50da49440
+refs/heads/master: 5349d3d880cdfdeda918f6e84e490f2e86f9d810
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -5644,14 +5644,12 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs)
 	BRCMF_TRACE(("%s: Enter\n", __func__));
 
 	/* alloc chip_info_t */
-	ci = kmalloc(sizeof(struct chip_info), GFP_ATOMIC);
+	ci = kzalloc(sizeof(struct chip_info), GFP_ATOMIC);
 	if (NULL == ci) {
 		BRCMF_ERROR(("%s: malloc failed!\n", __func__));
 		return -ENOMEM;
 	}
 
-	memset((unsigned char *)ci, 0, sizeof(struct chip_info));
-
 	/* bus/core/clk setup for register access */
 	/* Try forcing SDIO core to do ALPAvail request only */
 	clkset = SBSDIO_FORCE_HW_CLKREQ_OFF | SBSDIO_ALP_AVAIL_REQ;