From: Felix Fietkau <nbd@nbd.name>
Date: Sat, 9 Jul 2016 13:00:30 +0000 (+0200)
Subject: ath10k: fix a compiler warning
X-Git-Tag: v17.01.0-rc1~2114
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=916aebb300e9e9215723dd9a3892d91ba5695411;p=oweals%2Fopenwrt.git

ath10k: fix a compiler warning

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

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 e81e367d5b..596ef98639 100644
--- a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
+++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
@@ -10,12 +10,21 @@
  	ar->fw_api = 5;
  	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
  
+@@ -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) {