]> Pileus Git - ~andy/linux/commitdiff
iwlagn: free the ICT ISR when the request_irq failed
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Fri, 27 May 2011 15:40:29 +0000 (08:40 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Jun 2011 19:36:34 +0000 (15:36 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-agn.c

index 291ceb53c9120638e51b5775f9d450dd4002a2d8..76b333624a2eade2109583bd180658613c42acf5 100644 (file)
@@ -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: