1 --- a/drivers/net/wireless/ath/ath10k/core.c
2 +++ b/drivers/net/wireless/ath/ath10k/core.c
3 @@ -1165,9 +1165,6 @@ static int ath10k_core_fetch_firmware_fi
7 - /* calibration file is optional, don't check for any errors */
8 - ath10k_fetch_cal_file(ar);
11 ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
13 @@ -1870,6 +1867,9 @@ static int ath10k_core_probe_fw(struct a
17 + /* calibration file is optional, don't check for any errors */
18 + int calret = ath10k_fetch_cal_file(ar);
20 ret = ath10k_core_fetch_firmware_files(ar);
22 ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
23 @@ -1892,11 +1892,14 @@ static int ath10k_core_probe_fw(struct a
24 "could not load pre cal data: %d\n", ret);
27 - ret = ath10k_core_get_board_id_from_otp(ar);
28 - if (ret && ret != -EOPNOTSUPP) {
29 - ath10k_err(ar, "failed to get board id from otp: %d\n",
31 - goto err_free_firmware_files;
32 + /* otp and board file not needed if calibration data is present */
34 + ret = ath10k_core_get_board_id_from_otp(ar);
35 + if (ret && ret != -EOPNOTSUPP) {
36 + ath10k_err(ar, "failed to get board id from otp: %d\n",
42 ret = ath10k_core_fetch_board_file(ar);