ath10k: fix a compiler warning

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 936-ath10k_skip_otp_check.patch

diff --git a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
index 39aba41df4d2b062a47dd260c59f0fb0cfeed992..596ef9863902ecbbd3cdb394c7ffde3ba509414f 100644 (file)
--- a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
+++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -1165,9 +1165,6 @@ static int ath10k_core_fetch_firmware_fi
+@@ -1243,9 +1243,6 @@ static int ath10k_core_fetch_firmware_fi
  {
        int ret;
  
@@ -10,17 +10,26 @@
        ar->fw_api = 5;
        ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
  
-@@ -1870,6 +1867,9 @@ static int ath10k_core_probe_fw(struct a
+@@ -1944,7 +1941,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) {
+@@ -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);
++      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);
-@@ -1892,11 +1892,14 @@ static int ath10k_core_probe_fw(struct a
+@@ -1990,11 +1990,14 @@ static int ath10k_core_probe_fw(struct a
                           "could not load pre cal data: %d\n", ret);
        }
  
@@ -35,7 +44,7 @@
 +              if (ret && ret != -EOPNOTSUPP) {
 +                      ath10k_err(ar, "failed to get board id from otp: %d\n",
 +                              ret);
-+                      return ret;
++                      goto err_free_firmware_files;
 +              }
        }