diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-29 17:22:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-29 17:22:27 -0700 |
| commit | fd5984d7c8e8e249aca0c515817ab1e7dee1502c (patch) | |
| tree | 9997f5b130fe54f067824f0ff22900b2c99c03d5 /arch/x86/pci/irq.c | |
| parent | ad6ede80a0ad0eba6e0f77e35ab7753c60ed1e87 (diff) | |
| parent | 9eabc99a635a77cbf0948ce17d3cbc2b51680d4a (diff) | |
| download | linux-fd5984d7c8e8e249aca0c515817ab1e7dee1502c.tar.gz | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin: "One patch to avoid assigning interrupts we don't actually have on non-PC platforms, and two patches that addresses bugs in the new IOAPIC assignment code" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, irq, PCI: Keep IRQ assignment for runtime power management x86: irq: Fix bug in setting IOAPIC pin attributes x86: Fix non-PC platform kernel crash on boot due to NULL dereference
Diffstat (limited to 'arch/x86/pci/irq.c')
| -rw-r--r-- | arch/x86/pci/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c index bc1a2c341891..eb500c2592ad 100644 --- a/arch/x86/pci/irq.c +++ b/arch/x86/pci/irq.c @@ -1256,7 +1256,7 @@ static int pirq_enable_irq(struct pci_dev *dev) static void pirq_disable_irq(struct pci_dev *dev) { - if (io_apic_assign_pci_irqs && !dev->dev.power.is_prepared && + if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) && dev->irq) { mp_unmap_irq(dev->irq); dev->irq = 0; |