aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-09 15:00:30 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-09 19:42:26 +0200
commit916aebb300e9e9215723dd9a3892d91ba5695411 (patch)
tree907306f0a93ab049c3ebbe8f85f07660fcf49e46
parent73dd59546be473455f4dbeaac277feabaa80f800 (diff)
downloadupstream-916aebb300e9e9215723dd9a3892d91ba5695411.tar.gz
upstream-916aebb300e9e9215723dd9a3892d91ba5695411.tar.bz2
upstream-916aebb300e9e9215723dd9a3892d91ba5695411.zip
ath10k: fix a compiler warning
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch11
1 files changed, 10 insertions, 1 deletions
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) {