diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-11-13 03:41:59 +0100 | 
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-11-13 03:42:14 +0100 | 
| commit | abe949ce0f9be943d8762f91e04b8588255f2f70 (patch) | |
| tree | d479865f75acaa95fefbb20dccc502ca3cbd5d8d /drivers/net/wireless/intel/iwlwifi/mvm/d3.c | |
| parent | 035c5e2143f3edceeede1e99ff9cf8979c548dd5 (diff) | |
| parent | 2d5404caa8c7bb5c4e0435f94b28834ae5456623 (diff) | |
Merge tag 'v6.12-rc7' into x86/mm, to pick up fixes before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/d3.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 | 
1 files changed, 2 insertions, 0 deletions
| diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c index 49a6aff42376..244ca8cab9d1 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c @@ -1398,7 +1398,9 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)  	iwl_mvm_pause_tcm(mvm, true); +	mutex_lock(&mvm->mutex);  	iwl_fw_runtime_suspend(&mvm->fwrt); +	mutex_unlock(&mvm->mutex);  	return __iwl_mvm_suspend(hw, wowlan, false);  } | 
