summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2011-05-27 08:40:29 -0700
committerJohn W. Linville <linville@tuxdriver.com>2011-06-01 15:36:34 -0400
commit93cce6f0adff92238965eadb3c046db58552087b (patch)
treeed97ce9f17b883812aa77320fd6a4cd24cfa9360
parent2e5d04dad1934d97057cbecce59834f78dafc067 (diff)
downloadop-kernel-dev-93cce6f0adff92238965eadb3c046db58552087b.zip
op-kernel-dev-93cce6f0adff92238965eadb3c046db58552087b.tar.gz
iwlagn: free the ICT ISR when the request_irq failed
Fix a memory leak in case request_irq fails. Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 291ceb5..76b3336 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -3615,8 +3615,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
destroy_workqueue(priv->workqueue);
priv->workqueue = NULL;
free_irq(priv->pci_dev->irq, priv);
- iwl_free_isr_ict(priv);
out_disable_msi:
+ iwl_free_isr_ict(priv);
pci_disable_msi(priv->pci_dev);
iwl_uninit_drv(priv);
out_free_eeprom:
OpenPOWER on IntegriCloud