mac80211: Revision r36939 breaks support for RT5370 (rt2800usb)

[oweals/openwrt.git] / package / kernel / mac80211 / patches / 920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch

diff --git a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch b/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch
index cb3f7e2636914412638a94f9a6a9c76dad31559b..d04c4abb141a1ead1c62963aafeded4fa2555f35 100644 (file)
--- a/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch
+++ b/package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch
@@ -1,14 +1,14 @@
 --- 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
+@@ -280,7 +280,10 @@ static int ath10k_download_and_run_otp(s
  
-       ath10k_dbg(ATH10K_DBG_BOOT, "boot otp execute result %d\n", result);
+       ath10k_dbg(ar, 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");
++      if (result == 2) {
++              ath10k_warn(ar, "otp stream is empty, using board.bin contents");
 +              return 0;
 +      } else if (result != 0) {
-               ath10k_err("otp calibration failed: %d", result);
+               ath10k_err(ar, "otp calibration failed: %d", result);
                return -EINVAL;
        }