summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-08-29 17:22:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-29 17:22:27 -0700
commitfd5984d7c8e8e249aca0c515817ab1e7dee1502c (patch)
tree9997f5b130fe54f067824f0ff22900b2c99c03d5 /drivers/acpi
parentad6ede80a0ad0eba6e0f77e35ab7753c60ed1e87 (diff)
parent9eabc99a635a77cbf0948ce17d3cbc2b51680d4a (diff)
downloadlinux-next-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 'drivers/acpi')
-rw-r--r--drivers/acpi/pci_irq.c4
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)