The presence of a CLM file is described as optional, but missing the clm
blob causes the preinit to return unsuccessfully. Fix this by ignoring
the return value of the brcmf_c_process_clm_blob().
Also remove the extra debug print, as brcmf_c_process_clm_blob() already
did print a useful error message before returning.
Fixes: fdd0bd88ceae ("brcmfmac: add CLM download support")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
---
This regression was introduced in v4.15-rc1, but I unfortunately didn't test
WiFi until now. Included a Cc to stable@ in case you choose to pick this up
after v4.15.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 6a59d0609d30..0c67ba6ae135 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -278,12 +278,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
}
ri->result = err;
- /* Do any CLM downloading */
- err = brcmf_c_process_clm_blob(ifp);
- if (err < 0) {
- brcmf_err("download CLM blob file failed, %d\n", err);
- goto done;
- }
+ /* Do any optional CLM downloading */
+ brcmf_c_process_clm_blob(ifp);
/* query for 'ver' to get version info from firmware */
memset(buf, 0, sizeof(buf));
--
2.15.0