iwlwifi: mvm: don't restart HW if suspending fails before D3 image is loaded

If we haven't loaded the D3 image yet and a failure in the suspend
process occurs, we shouldn't restart the HW, because we're still
running the D0 image.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index b9e1f30e33de29ca14c61ee08114c910b6753579..665f87e788d6ec2a78e9ab1ba6a3af8795c2c752 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -1227,10 +1227,11 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,
        mvm->aux_sta.sta_id = old_aux_sta_id;
        mvm_ap_sta->sta_id = old_ap_sta_id;
        mvmvif->ap_sta_id = old_ap_sta_id;
- out_noreset:
-       kfree(key_data.rsc_tsc);
+
        if (ret < 0)
                ieee80211_restart_hw(mvm->hw);
+ out_noreset:
+       kfree(key_data.rsc_tsc);
 
        mutex_unlock(&mvm->mutex);