From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 1 Apr 2015 08:00:31 +0000 (+0200)
Subject: iwlwifi: mvm: don't return uninitialized value in get_survey()
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=10a7c028dbf9920ba6781bf1adde1811dc50de86;p=deliverable%2Flinux.git

iwlwifi: mvm: don't return uninitialized value in get_survey()

If ucode_loaded isn't true the function returns the 'ret' variable
without having assigned a value properly. Fix that.

Reported-by: Haim Dreyfuss <haim.dreyfuss@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index fc73cc1bda0d..74912e7fd3b2 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -3911,6 +3911,7 @@ static int iwl_mvm_mac_get_survey(struct ieee80211_hw *hw, int idx,
 			    mvm->radio_stats.on_time_scan;
 	do_div(survey->time_scan, USEC_PER_MSEC);
 
+	ret = 0;
  out:
 	mutex_unlock(&mvm->mutex);
 	return ret;