dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

PCI: portdrv: add missing irq cleanup

Browse source 
Add missing service irqs cleanup in the error code path of
pcie_port_device_register().

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Kenji Kaneshige 2009-11-25 21:05:01 +09:00 committed by Jesse Barnes
parent 1ce5e83063
commit fbb5de70bb
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/pci/pcie/portdrv_core.c
View file

@ -205,6 +205,14 @@ static int init_service_irqs(struct pci_dev *dev, int *irqs, int mask)
return 0;
}
static void cleanup_service_irqs(struct pci_dev *dev)
{
if (dev->msix_enabled)
pci_disable_msix(dev);
else if (dev->msi_enabled)
pci_disable_msi(dev);
}
/**
* get_port_device_capability - discover capabilities of a PCI Express port
* @dev: PCI Express port to examine
@ -332,10 +340,12 @@ int pcie_port_device_register(struct pci_dev *dev)
}
if (!nr_serv) {
status = -ENODEV;
goto error_disable;
goto error_cleanup_irqs;
}
return 0;
error_cleanup_irqs:
cleanup_service_irqs(dev);
error_disable:
pci_disable_device(dev);
error_kfree:
@ -410,12 +420,7 @@ void pcie_port_device_remove(struct pci_dev *dev)
struct pcie_port_data *port_data = pci_get_drvdata(dev);
device_for_each_child(&dev->dev, NULL, remove_iter);
if (dev->msix_enabled)
pci_disable_msix(dev);
else if (dev->msi_enabled)
pci_disable_msi(dev);
cleanup_service_irqs(dev);
pci_disable_device(dev);
kfree(port_data);
}