1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 9c62340c2360..c96887d5289e 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -481,6 +481,10 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
         if (!pin)
                 return;
 
+        /* Keep IOAPIC pin configuration when suspending */
+        if (dev->dev.power.is_prepared)
+                return;
+
         entry = acpi_pci_irq_lookup(dev, pin);
         if (!entry)
                 return;
@@ -498,5 +502,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
          */
 
         dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));
-        acpi_unregister_gsi(gsi);
+        if (gsi >= 0 && dev->irq > 0)
+                acpi_unregister_gsi(gsi);
 }