From a6a3d0a94dc91bdaaedfbbc10c44872b2c6f3ca1 Mon Sep 17 00:00:00 2001 From: Wey-Yi Guy Date: Mon, 10 Oct 2011 07:27:05 -0700 Subject: [PATCH] --- yaml --- r: 266742 b: refs/heads/master c: 281e27c8092da95c83f6bc3df8fc11235f4b364c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3c198edac152..c8ac6ee378f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e8107ed9058e910eee982ee94d3a5eb201fb5d1 +refs/heads/master: 281e27c8092da95c83f6bc3df8fc11235f4b364c diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c index fa2ce398da85..fec7065e75e6 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c +++ b/trunk/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;