openwrtv4/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
Felix Fietkau 67a7daa938 mac80211: update to wireless-testing 2016-06-20
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-07-02 19:34:50 +02:00

42 lines
1.3 KiB
Diff

--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1243,9 +1243,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);
@@ -1968,6 +1965,9 @@ static int ath10k_core_probe_fw(struct a
goto err_power_down;
}
+ /* calibration file is optional, don't check for any errors */
+ int 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);
@@ -1990,11 +1990,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);