From e84e34c011af7399f5715d518eeaa08ae06a1a3c Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Thu, 7 Jun 2018 17:55:04 -0700 Subject: [PATCH] cnss2: Do not load board data file if bdf_bypass is enabled Send dummy board data file to firmware if bdf_bypass is enabled, no matter the real file is present or not. Change-Id: I042d0ce7190fa56f362baf99c5847edf50419377 Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/qmi.c | 16 ++++++++-------- 1 file 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;