From 2cf9502f9a72521797d5caf3a794d975560a4cbc Mon Sep 17 00:00:00 2001 From: Franky Lin Date: Tue, 2 Apr 2013 21:06:20 +0200 Subject: [PATCH] --- yaml --- r: 362401 b: refs/heads/master c: 3eaa956c5b18b9c955ae5a4e6e6909cae23f38e0 h: refs/heads/master i: 362399: 700b8cb61fa786b68a5a1e4e21dc70820928076a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f01d65560a89..7526cde2d9e0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5bf53a826d22c284e6e1d309d32c388684e26a7 +refs/heads/master: 3eaa956c5b18b9c955ae5a4e6e6909cae23f38e0 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index 4469321c0eb3..35fc68be158d 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -3317,15 +3317,15 @@ static int _brcmf_sdbrcm_download_firmware(struct brcmf_sdio *bus) goto err; } - /* External image takes precedence if specified */ if (brcmf_sdbrcm_download_code_file(bus)) { brcmf_err("dongle image file download failed\n"); 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"); + goto err; + } /* Take arm out of reset */ if (brcmf_sdbrcm_download_state(bus, false)) {