Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e387b9ee authored by Michael Ellerman's avatar Michael Ellerman Committed by Greg Kroah-Hartman
Browse files

MSI: Simplify BUG() handling in pci_disable_msi() 



Although it might be nice to do a printk before BUG'ing, it's really not
necessary, and it complicates the code.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 54eee4c5

drivers/pci/msi.c

+9 −12
Original line number Diff line number Diff line
@@ -572,18 +572,15 @@ void pci_disable_msi(struct pci_dev* dev) 
	if (!entry || !entry->dev || entry->msi_attrib.type != PCI_CAP_ID_MSI) {

		return;

	}

	if (irq_has_action(dev->first_msi_irq)) {

		printk(KERN_WARNING "PCI: %s: pci_disable_msi() 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 {



	default_irq = entry->msi_attrib.default_irq;

	msi_free_irq(dev, dev->first_msi_irq);



	/* Restore dev->irq to its default pin-assertion irq */

	dev->irq = default_irq;

	}



	dev->first_msi_irq = 0;

}