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 /drivers | |
| parent | ad6ede80a0ad0eba6e0f77e35ab7753c60ed1e87 (diff) | |
| parent | 9eabc99a635a77cbf0948ce17d3cbc2b51680d4a (diff) | |
| download | linux-fd5984d7c8e8e249aca0c515817ab1e7dee1502c.tar.gz linux-fd5984d7c8e8e249aca0c515817ab1e7dee1502c.tar.bz2 linux-fd5984d7c8e8e249aca0c515817ab1e7dee1502c.zip | |
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 'drivers')
| -rw-r--r-- | drivers/acpi/pci_irq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index c96887d5289e..6e6b80eb0bba 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -484,6 +484,10 @@ void acpi_pci_irq_disable(struct pci_dev *dev) /* Keep IOAPIC pin configuration when suspending */ if (dev->dev.power.is_prepared) return; +#ifdef CONFIG_PM_RUNTIME + if (dev->dev.power.runtime_status == RPM_SUSPENDING) + return; +#endif entry = acpi_pci_irq_lookup(dev, pin); if (!entry) |