Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b70ab727 authored by Luciano Coelho's avatar Luciano Coelho Committed by Emmanuel Grumbach
Browse files

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: default avatarLuciano Coelho <luciano.coelho@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 5b577a90

drivers/net/wireless/iwlwifi/mvm/d3.c

+3 −2
Original line number Diff line number Diff line
@@ -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);