diff options
author | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-01-12 12:10:00 -0800 |
commit | 9ee6045f09a7875ebe55b9942b232a19076b157b (patch) | |
tree | 4c3924d35d99d413a95205ac21da8d369063234b /drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | |
parent | 3b09c84cb622ffbcdb5d541986b1eaf7d5812602 (diff) | |
parent | 1140afa862842ac3e56678693050760edc4ecde9 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c')
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 5a002a21f10..f7eeee1dcdb 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/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); |