Commit 45dad03a authored Oct 07, 2016 by Luca Coelho Committed by Greg Kroah-Hartman May 14, 2017

iwlwifi: mvm: don't restart HW if suspend fails with unified image



commit bac453ab3745eaa64137ea6e77e009b45954f0ae upstream.

For unified images, we shouldn't restart the HW if suspend fails.  The
only reason for restarting the HW with non-unified images is to go
back to the D0 image.

Fixes: 23ae6128 ("iwlwifi: mvm: Do not switch to D3 image on suspend")
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d0a8075f

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

+8 −5

Original line number	Diff line number	Diff line
		@@ -1262,12 +1262,15 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,
		iwl_trans_d3_suspend(mvm->trans, test, !unified_image);
		out:
		if (ret < 0) {
		iwl_mvm_free_nd(mvm);

		if (!unified_image) {
		iwl_mvm_ref(mvm, IWL_MVM_REF_UCODE_DOWN);
		if (mvm->restart_fw > 0) {
		mvm->restart_fw--;
		ieee80211_restart_hw(mvm->hw);
		}
		iwl_mvm_free_nd(mvm);
		}
		}
		out_noreset:
		mutex_unlock(&mvm->mutex);