aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
index 237efe0ac1c4..eafc517a5f9e 100644
--- a/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c
@@ -202,18 +202,15 @@ int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,
202 struct cfg80211_chan_def *chandef, 202 struct cfg80211_chan_def *chandef,
203 u8 chains_static, u8 chains_dynamic) 203 u8 chains_static, u8 chains_dynamic)
204{ 204{
205 int ret;
206
207 WARN_ON(!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) && 205 WARN_ON(!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) &&
208 ctxt->ref); 206 ctxt->ref);
209 lockdep_assert_held(&mvm->mutex); 207 lockdep_assert_held(&mvm->mutex);
210 208
211 ctxt->channel = chandef->chan; 209 ctxt->channel = chandef->chan;
212 ret = iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,
213 chains_static, chains_dynamic,
214 FW_CTXT_ACTION_ADD, 0);
215 210
216 return ret; 211 return iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,
212 chains_static, chains_dynamic,
213 FW_CTXT_ACTION_ADD, 0);
217} 214}
218 215
219/* 216/*