Skip to content

Commit cc124d5

Browse files
WenChieh-FengKalle Valo
authored andcommitted
brcmfmac: fix CLM load error for legacy chips when user helper is enabled
For legacy chips without CLM blob files, kernel with user helper function returns -EAGAIN when we request_firmware(), and then driver got failed when bringing up legacy chips. We expect the CLM blob file for legacy chip is not existence in firmware path, but the -ENOENT error is transferred to -EAGAIN in firmware_class.c with user helper. Because of that, we continue with CLM data currently present in firmware if getting error from doing request_firmware(). Cc: [email protected] # v4.15.y Reviewed-by: Arend van Spriel <[email protected]> Signed-off-by: Wright Feng <[email protected]> Signed-off-by: Kalle Valo <[email protected]>
1 parent 58eae14 commit cc124d5

File tree

1 file changed

+3
-6
lines changed
  • drivers/net/wireless/broadcom/brcm80211/brcmfmac

1 file changed

+3
-6
lines changed

drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,12 +182,9 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
182182

183183
err = request_firmware(&clm, clm_name, dev);
184184
if (err) {
185-
if (err == -ENOENT) {
186-
brcmf_dbg(INFO, "continue with CLM data currently present in firmware\n");
187-
return 0;
188-
}
189-
brcmf_err("request CLM blob file failed (%d)\n", err);
190-
return err;
185+
brcmf_info("no clm_blob available(err=%d), device may have limited channels available\n",
186+
err);
187+
return 0;
191188
}
192189

193190
chunk_buf = kzalloc(sizeof(*chunk_buf) + MAX_CHUNK_LEN - 1, GFP_KERNEL);

0 commit comments

Comments
 (0)