--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -277,7 +277,10 @@ static int ath10k_download_and_run_otp(s
-
- ath10k_dbg(ATH10K_DBG_BOOT, "boot otp execute result %d\n", result);
-
-- if (result != 0) {
-+ if (result == 2) {
-+ ath10k_warn("otp stream is empty, using board.bin contents");
-+ return 0;
-+ } else if (result != 0) {
- ath10k_err("otp calibration failed: %d", result);
- return -EINVAL;
+@@ -391,8 +391,13 @@ static int ath10k_download_and_run_otp(s
+ if (!(skip_otp || test_bit(ATH10K_FW_FEATURE_IGNORE_OTP_RESULT,
+ ar->fw_features))
+ && result != 0) {
+- ath10k_err(ar, "otp calibration failed: %d", result);
+- return -EINVAL;
++ if (result == 2) {
++ ath10k_warn(ar, "otp stream is empty, using board.bin contents");
++ return 0;
++ } else {
++ ath10k_err(ar, "otp calibration failed: %d", result);
++ return -EINVAL;
++ }
}
+
+ return 0;