X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=drivers%2Fnet%2Fwireless%2Fbroadcom%2Fbrcm80211%2Fbrcmfmac%2Fcommon.c;h=9047a0813ebf03926e879bb2442f6546baa8aba0;hb=533693d71c5d3d4f06c4f656803200d3e28ae0b1;hp=e3758bd86acf0cba5a9fb08403f049dfa36fed72;hpb=d85ddd1318e66c0c2665dbfcbc21a8b66c9152aa;p=platform%2Fkernel%2Flinux-rpi.git diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index e3758bd..9047a08 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c @@ -134,13 +134,23 @@ static int brcmf_c_process_clm_blob(struct brcmf_if *ifp) brcmf_dbg(TRACE, "Enter\n"); memset(clm_name, 0, sizeof(clm_name)); - err = brcmf_bus_get_fwname(bus, ".clm_blob", clm_name); + err = brcmf_bus_get_board_fwname(bus, ".clm_blob", clm_name); if (err) { bphy_err(drvr, "get CLM blob file name failed (%d)\n", err); return err; } - err = firmware_request_nowarn(&clm, clm_name, bus->dev); + if (clm_name[0]) + err = firmware_request_nowarn(&clm, clm_name, bus->dev); + if (err || !clm_name[0]) { + err = brcmf_bus_get_fwname(bus, ".clm_blob", clm_name); + if (err) { + bphy_err(drvr, "get CLM blob file name failed (%d)\n", err); + return err; + } + + err = firmware_request_nowarn(&clm, clm_name, bus->dev); + } if (err) { brcmf_info("no clm_blob available (err=%d), device may have limited channels available\n", err);