mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
52 lines
1.5 KiB
Diff
52 lines
1.5 KiB
Diff
--- a/drivers/net/wireless/ath/ath10k/core.c
|
|
+++ b/drivers/net/wireless/ath/ath10k/core.c
|
|
@@ -1282,9 +1282,6 @@ static int ath10k_core_fetch_firmware_fi
|
|
{
|
|
int ret;
|
|
|
|
- /* calibration file is optional, don't check for any errors */
|
|
- ath10k_fetch_cal_file(ar);
|
|
-
|
|
ar->fw_api = 5;
|
|
ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
|
|
|
|
@@ -2054,7 +2051,7 @@ EXPORT_SYMBOL(ath10k_core_stop);
|
|
static int ath10k_core_probe_fw(struct ath10k *ar)
|
|
{
|
|
struct bmi_target_info target_info;
|
|
- int ret = 0;
|
|
+ int calret, ret = 0;
|
|
|
|
ret = ath10k_hif_power_up(ar);
|
|
if (ret) {
|
|
@@ -2078,6 +2075,9 @@ static int ath10k_core_probe_fw(struct a
|
|
goto err_power_down;
|
|
}
|
|
|
|
+ /* calibration file is optional, don't check for any errors */
|
|
+ calret = ath10k_fetch_cal_file(ar);
|
|
+
|
|
ret = ath10k_core_fetch_firmware_files(ar);
|
|
if (ret) {
|
|
ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
|
|
@@ -2100,11 +2100,14 @@ static int ath10k_core_probe_fw(struct a
|
|
"could not load pre cal data: %d\n", ret);
|
|
}
|
|
|
|
- ret = ath10k_core_get_board_id_from_otp(ar);
|
|
- if (ret && ret != -EOPNOTSUPP) {
|
|
- ath10k_err(ar, "failed to get board id from otp: %d\n",
|
|
- ret);
|
|
- goto err_free_firmware_files;
|
|
+ /* otp and board file not needed if calibration data is present */
|
|
+ if (calret) {
|
|
+ ret = ath10k_core_get_board_id_from_otp(ar);
|
|
+ if (ret && ret != -EOPNOTSUPP) {
|
|
+ ath10k_err(ar, "failed to get board id from otp: %d\n",
|
|
+ ret);
|
|
+ goto err_free_firmware_files;
|
|
+ }
|
|
}
|
|
|
|
ret = ath10k_core_fetch_board_file(ar);
|