summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2012-09-18 19:48:59 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-09-18 20:43:23 -0400
commita7be50b7e30f9d77cb059a7ffdb781bb0fb92eba (patch)
treedf692ebd836af64cd7114b589b54669d6a29b6b1
parenta85d0d7f3460b1a123b78e7f7e39bf72c37dfb78 (diff)
downloadlinux-3.10-a7be50b7e30f9d77cb059a7ffdb781bb0fb92eba.tar.gz
linux-3.10-a7be50b7e30f9d77cb059a7ffdb781bb0fb92eba.tar.bz2
linux-3.10-a7be50b7e30f9d77cb059a7ffdb781bb0fb92eba.zip
iwlwifi: don't double free the interrupt in failure path
When the driver can't get the HW ready, we would release the interrupt twice which made the kernel complain loudly. Cc: stable@vger.kernel.org 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>
-rw-r--r--drivers/net/wireless/iwlwifi/pcie/trans.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
index 1e86ea2266d..dbeebef562d 100644
--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
@@ -1442,6 +1442,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);