From c10349a5e8b1787ce5f84785897560fd089c7f76 Mon Sep 17 00:00:00 2001 From: Thomas Meyer Date: Sat, 6 Aug 2011 13:26:29 +0200 Subject: [PATCH] --- yaml --- r: 267507 b: refs/heads/master c: 5349d3d880cdfdeda918f6e84e490f2e86f9d810 h: refs/heads/master i: 267505: 6a47f9f10efbf6e0e801d76554d504bc86c78574 267503: ee4fe0b0055986ab5bcbb210dab9754722a54b72 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fa41b2832087..731c3af1b33b 100644 --- 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 index 53d4825cc726..7632a0ebd970 100644 --- 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;