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>

diff --git a/drivers/net/wireless/bcmdhd/dhd_sdio.c b/drivers/net/wireless/bcmdhd/dhd_sdio.c
index 2dbb802..e57654b 100644 (file)
--- 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 */