Skip to content

Commit

Permalink
msi: Fix msi_remove_pci_irq_vectors.
Browse files Browse the repository at this point in the history
Since msi_remove_pci_irq_vectors is designed to be called during
hotplug remove it is actively wrong to query the hardware and expect
meaningful results back.

To that end remove the pci_find_capability calls.  Testing
dev->msi_enabled and dev->msix_enabled gives us all of the information
we need.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Eric W. Biederman authored and Greg Kroah-Hartman committed Feb 7, 2007
1 parent d40f540 commit 866a8c8
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions drivers/pci/msi.c
Original file line number Diff line number Diff line change
Expand Up @@ -854,13 +854,10 @@ void pci_disable_msix(struct pci_dev* dev)
**/
void msi_remove_pci_irq_vectors(struct pci_dev* dev)
{
int pos;

if (!pci_msi_enable || !dev)
return;

pos = pci_find_capability(dev, PCI_CAP_ID_MSI);
if (pos > 0 && dev->msi_enabled) {
if (dev->msi_enabled) {
if (irq_has_action(dev->first_msi_irq)) {
printk(KERN_WARNING "PCI: %s: msi_remove_pci_irq_vectors() "
"called without free_irq() on MSI irq %d\n",
Expand All @@ -869,8 +866,7 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev)
} else /* Release MSI irq assigned to this device */
msi_free_irq(dev, dev->first_msi_irq);
}
pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);
if (pos > 0 && dev->msix_enabled) {
if (dev->msix_enabled) {
int irq, head, tail = 0, warning = 0;
void __iomem *base = NULL;

Expand Down

0 comments on commit 866a8c8

Please sign in to comment.