Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eaa956c authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcmfmac: do not proceed if fail to download nvram to dongle 



Nvram contains critical initialization parameter for firmware to run. Host
driver should not proceed if nvram fails to be downloaded to dongle.

Reviewed-by: default avatarPiotr Haber <phaber@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c5bf53a8

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -3317,15 +3317,15 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus) 
		goto err;

		goto err;

	}

	}





	/* External image takes precedence if specified */

	if (brcmf_sdbrcm_download_code_file(bus)) {

	if (brcmf_sdbrcm_download_code_file(bus)) {

		brcmf_err("dongle image file download failed\n");

		brcmf_err("dongle image file download failed\n");

		goto err;

		goto err;

	}

	}





	/* External nvram takes precedence if specified */

	if (brcmf_sdbrcm_download_nvram(bus)) {

	if (brcmf_sdbrcm_download_nvram(bus))

		brcmf_err("dongle nvram file download failed\n");

		brcmf_err("dongle nvram file download failed\n");

		goto err;

	}





	/* Take arm out of reset */

	/* Take arm out of reset */

	if (brcmf_sdbrcm_download_state(bus, false)) {

	if (brcmf_sdbrcm_download_state(bus, false)) {