---

yaml --- r: 266742 b: refs/heads/master c: 281e27c h: refs/heads/master v: v3
git-mirror · Oct 14, 2011 · a6a3d0a · a6a3d0a
1 parent 8b90d3a
commit a6a3d0a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;