diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-07-12 05:37:15 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-12 05:37:14 -0700 |
| commit | dad1ae12b398d8a01a810ea57164068d3fdc1040 (patch) | |
| tree | eb1faaadb672dd9ff12409b63c1956401d738295 | |
| parent | 926778dc85f5afd05d763ddf87df308d28eb3c8b (diff) | |
| parent | e84e34c011af7399f5715d518eeaa08ae06a1a3c (diff) | |
Merge "cnss2: Do not load board data file if bdf_bypass is enabled"
| -rw-r--r-- | drivers/net/wireless/cnss2/qmi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/cnss2/qmi.c b/drivers/net/wireless/cnss2/qmi.c index b8777c18d252..cc4583996d1c 100644 --- a/drivers/net/wireless/cnss2/qmi.c +++ b/drivers/net/wireless/cnss2/qmi.c @@ -514,17 +514,17 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv) BDF_FILE_NAME_PREFIX "%02x", plat_priv->board_info.board_id); + if (bdf_bypass) { + cnss_pr_info("bdf_bypass is enabled, sending dummy BDF\n"); + temp = filename; + remaining = MAX_BDF_FILE_NAME; + goto bypass_bdf; + } + ret = request_firmware(&fw_entry, filename, &plat_priv->plat_dev->dev); if (ret) { cnss_pr_err("Failed to load BDF: %s\n", filename); - if (bdf_bypass) { - cnss_pr_info("bdf_bypass is enabled, sending dummy BDF\n"); - temp = filename; - remaining = MAX_BDF_FILE_NAME; - goto bypass_bdf; - } else { - goto err_req_fw; - } + goto err_req_fw; } temp = fw_entry->data; |