From 2e13b81094feb34191431e6e232b5a4a9737cbbb Mon Sep 17 00:00:00 2001 From: Emmanuel Grumbach Date: Tue, 4 Dec 2012 22:53:30 +0200 Subject: [PATCH] --- yaml --- r: 342125 b: refs/heads/master c: 8d96bb61fcfa11fb0c0da0d4f1331b7ca231bec1 h: refs/heads/master i: 342123: df163ce22cc5f24bd38aabddeb43f73b666dea71 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/pcie/trans.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1b2f2dea445c..34bd9fc1b788 100644 --- 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 index 09d2ed1e8020..39d6219ff8f3 100644 --- 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