From: Howard M. Harte <hharte@broadcom.com>
Date: Tue, 26 Jul 2011 00:19:49 +0000 (-0700)
Subject: Fix a potential crash/memory leak if NVRAM fails to load.
X-Git-Tag: firefly_0821_release~7613^2~395
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fe4d980150fb55a303885ca28b4667c5547219ca;p=firefly-linux-kernel-4.4.55.git

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 2dbb8027569e..e57654b20e8b 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 */