summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward M. Harte <hharte@broadcom.com>2011-07-25 17:19:49 -0700
committerJonas ABERG <jonas.aberg@stericsson.com>2011-10-28 10:59:52 +0200
commit6d6fb2996b129a247304229b9cbbcdb908680595 (patch)
treeda40a31d0f760e697a6af8741643090fdc0fdc0a
parentc65c6973ac601844c9a21b539c62d55b95d63d70 (diff)
Fix a potential crash/memory leak if NVRAM fails to load.
Change-Id: I27f41dd5833835b74f38524e9691d68ac807c991 Signed-off-by: Howard M. Harte <hharte@broadcom.com> Signed-off-by: Dmitry Shmidt <dimitrysh@google.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35555 Tested-by: Per VAHLNE <per.xx.vahlne@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/net/wireless/bcmdhd/dhd_sdio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd_sdio.c b/drivers/net/wireless/bcmdhd/dhd_sdio.c
index 2dbb8027569..e57654b20e8 100644
--- a/drivers/net/wireless/bcmdhd/dhd_sdio.c
+++ b/drivers/net/wireless/bcmdhd/dhd_sdio.c
@@ -6067,6 +6067,7 @@ _dhdsdio_download_firmware(struct dhd_bus *bus)
/* External nvram takes precedence if specified */
if (dhdsdio_download_nvram(bus)) {
DHD_ERROR(("%s: dongle nvram file download failed\n", __FUNCTION__));
+ goto err;
}
/* Take arm out of reset */