From 7a909746805ea06baa8b504badf05d0f6fecd724 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sun, 8 Jan 2012 23:41:21 +0100 Subject: [PATCH] --- yaml --- r: 284325 b: refs/heads/master c: c40701eacbaebcfe3fb6fac8ef3da653021c212c h: refs/heads/master i: 284323: c43e29660b01257af8f14c15d82f0d2fb24feb2b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0835fa92ba66..cd316bf408cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4922f2b5f1c2b3daa80b56a6eeca984cbee0dde +refs/heads/master: c40701eacbaebcfe3fb6fac8ef3da653021c212c diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 5a002a21f108..f7eeee1dcdb6 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -3119,8 +3119,10 @@ static int brcmf_sdbrcm_write_vars(struct brcmf_sdio *bus) /* Verify NVRAM bytes */ brcmf_dbg(INFO, "Compare NVRAM dl & ul; varsize=%d\n", varsize); nvram_ularray = kmalloc(varsize, GFP_ATOMIC); - if (!nvram_ularray) + if (!nvram_ularray) { + kfree(vbuffer); return -ENOMEM; + } /* Upload image to verify downloaded contents. */ memset(nvram_ularray, 0xaa, varsize);