From 4f10009f71d2db4a28754122a18b562974b6d860 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Thu, 22 Mar 2007 21:51:31 +1100 Subject: [PATCH] --- yaml --- r: 53339 b: refs/heads/master c: c31af3987020eeb1facf64d702dcf39e6c7382e6 h: refs/heads/master i: 53337: 86b6a78ccb3c596e66ac56392a097b8c0b8355b4 53335: d1f38fbff58b5af7d343db4dc7f26210d965158d v: v3 --- [refs] | 2 +- trunk/drivers/pci/msi.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 76a0bf59d23e..87d9d88709cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54bc6c0b0edd164fc2ea85b3964736c182f6bd5d +refs/heads/master: c31af3987020eeb1facf64d702dcf39e6c7382e6 diff --git a/trunk/drivers/pci/msi.c b/trunk/drivers/pci/msi.c index db452319be90..2a119f8d0dc6 100644 --- a/trunk/drivers/pci/msi.c +++ b/trunk/drivers/pci/msi.c @@ -719,13 +719,8 @@ void msi_remove_pci_irq_vectors(struct pci_dev* dev) return; 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", - pci_name(dev), dev->first_msi_irq); - BUG_ON(irq_has_action(dev->first_msi_irq)); - } else /* Release MSI irq assigned to this device */ - msi_free_irq(dev, dev->first_msi_irq); + BUG_ON(irq_has_action(dev->first_msi_irq)); + msi_free_irq(dev, dev->first_msi_irq); } if (dev->msix_enabled) { int irq, head, tail = 0, warning = 0;