From: Wey-Yi Guy Date: Mon, 10 Oct 2011 14:27:05 +0000 (-0700) Subject: iwlagn: do nothing when disable agg in wrong state X-Git-Tag: firefly_0821_release~3680^2~4273^2~83^2~69 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=281e27c8092da95c83f6bc3df8fc11235f4b364c;p=firefly-linux-kernel-4.4.55.git iwlagn: do nothing when disable agg in wrong state When disable aggregation request come in on wrong agg state. ignore it Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index fa2ce398da85..fec7065e75e6 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c @@ -636,6 +636,8 @@ int iwl_trans_pcie_tx_agg_disable(struct iwl_trans *trans, default: IWL_WARN(trans, "Stopping AGG while state not ON" "or starting\n"); + spin_unlock_irqrestore(&trans->shrd->sta_lock, flags); + return 0; } write_ptr = trans_pcie->txq[txq_id].q.write_ptr;