imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-02 23:54:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"

Browse Source 
Revert 8affb487d4 ("x86/PCI: Don't alloc pcibios-irq when MSI is
enabled").

This is part of reverting 991de2e590 ("PCI, x86: Implement
pcibios_alloc_irq() and pcibios_free_irq()") to fix regressions it
introduced.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=111211
Fixes: 991de2e590 ("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()")
Signed-off-by: Bjorn Helgaas <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
CC: Jiang Liu <[email protected]>
CC: Joerg Roedel <[email protected]>
This commit is contained in:
Bjorn Helgaas committed 2016-02-17 12:26:33 -06:00
1 parent 0cf1337e0b
commit fe25d07887
1 file changed
-8
Download Patch File Download Diff File Expand all files Collapse all files
arch/x86/pci/common.c
-8
View File
@@ -713,14 +713,6 @@ int pcibios_add_device(struct pci_dev *dev)
int pcibios_alloc_irq(struct pci_dev *dev)
{
/*
* If the PCI device was already claimed by core code and has
* MSI enabled, probing of the pcibios IRQ will overwrite
* dev->irq. So bail out if MSI is already enabled.
*/
if (pci_dev_msi_enabled(dev))
return -EBUSY;
return pcibios_enable_irq(dev);
}