summaryrefslogtreecommitdiff
path: root/drivers/staging/brcm80211
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2011-03-13 21:58:47 +0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 12:22:54 -0700
commit570edd3b2337a94b4159aa9ff10e0b96c5a69ec2 (patch)
tree0946e41fcdf28d3a952955f7111e6c10ee4839f4 /drivers/staging/brcm80211
parentab42abf33a3efdf754710a0a513c00c40854cd61 (diff)
staging: brcm80211: fix memory leaks
Free resources before exit. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211')
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_sdio.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index a6da7268d87a..106627040db0 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -5641,6 +5641,10 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
unsigned char *ularray;
ularray = kmalloc(bus->ramsize, GFP_ATOMIC);
+ if (!ularray) {
+ bcmerror = BCME_NOMEM;
+ goto err;
+ }
/* Upload image to verify downloaded contents. */
offset = 0;
memset(ularray, 0xaa, bus->ramsize);
@@ -5652,7 +5656,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
DHD_ERROR(("%s: error %d on reading %d membytes"
" at 0x%08x\n",
__func__, bcmerror, MEMBLOCK, offset));
- goto err;
+ goto free;
}
offset += MEMBLOCK;
@@ -5666,7 +5670,7 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
DHD_ERROR(("%s: error %d on reading %d membytes at 0x%08x\n",
__func__, bcmerror,
sizeof(dlarray) - offset, offset));
- goto err;
+ goto free;
}
}
@@ -5674,11 +5678,11 @@ static int dhdsdio_download_code_array(struct dhd_bus *bus)
DHD_ERROR(("%s: Downloaded image is corrupted.\n",
__func__));
ASSERT(0);
- goto err;
+ goto free;
} else
DHD_ERROR(("%s: Download/Upload/Compare succeeded.\n",
__func__));
-
+free:
kfree(ularray);
}
#endif /* DHD_DEBUG */