---

yaml --- r: 342125 b: refs/heads/master c: 8d96bb6 h: refs/heads/master i: 342123: df163ce v: v3
git-mirror · Dec 6, 2012 · 2e13b81 · 2e13b81
1 parent 0375740
commit 2e13b81
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: 6a06b6c131d529f2913513355dd9e7c4e05e8e42
+refs/heads/master: 8d96bb61fcfa11fb0c0da0d4f1331b7ca231bec1
diff --git a/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c b/trunk/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -635,6 +635,8 @@ static void iwl_trans_pcie_stop_hw(struct iwl_trans *trans,
 	iwl_disable_interrupts(trans);
 	spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
 
+	iwl_pcie_disable_ict(trans);
+
 	if (!op_mode_leaving) {
 		/*
 		 * Even if we stop the HW, we still want the RF kill