summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-09-18 19:48:59 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-02 10:39:45 -0700
commit54abcfeb2ce031f864b8a8c574333446af335c3c (patch)
tree73b1c37c6a45f2b922ab32c809ef2fbedaeeebae /drivers/net
parent0bcaf42e89b5be757bf4ffc4063411c8ebe40e06 (diff)
iwlwifi: don't double free the interrupt in failure path
commit a7be50b7e30f9d77cb059a7ffdb781bb0fb92eba upstream. When the driver can't get the HW ready, we would release the interrupt twice which made the kernel complain loudly. Reported-by: Brian Cockrell <brian.cockrell@intel.com> Tested-by: Brian Cockrell <brian.cockrell@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-trans-pcie.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
index 79c6b91417f9..e3e651ec0ea6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
+++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c
@@ -1437,6 +1437,7 @@ static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
return err;
err_free_irq:
+ trans_pcie->irq_requested = false;
free_irq(trans_pcie->irq, trans);
error:
iwl_free_isr_ict(trans);