Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

kernel: Commit

kernel


Commit MetaInfo

Revisionf9a12e05508af800e8e1c103cdf9d11d5fed99a0 (tree)
Time2019-08-28 13:36:04
AuthorBjorn Andersson <bjorn.andersson@lina...>
CommiterChih-Wei Huang

Log Message

brcmfmac: Make sure CLM downloading is optional

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@vger.kernel.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Change Summary

Incremental Difference

--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -257,12 +257,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
257257 brcmf_chip_name(bus->chip, bus->chiprev,
258258 ri->chipname, sizeof(ri->chipname));
259259
260- /* Do any CLM downloading */
261- err = brcmf_c_process_clm_blob(ifp);
262- if (err < 0) {
263- brcmf_err("download CLM blob file failed, %d\n", err);
264- goto done;
265- }
260+ /* Do any optional CLM downloading */
261+ brcmf_c_process_clm_blob(ifp);
266262
267263 /* query for 'ver' to get version info from firmware */
268264 memset(buf, 0, sizeof(buf));
Show on old repository browser