Merge branch 'pm-sleep'

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / sleep.c

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index a0b4d781e606e248159ee21c1d53810a91ff5ad6..0d94621dc856080a0a3715040b7b5339c1edb248 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -635,14 +635,16 @@ static int acpi_freeze_prepare(void)
        acpi_enable_wakeup_devices(ACPI_STATE_S0);
        acpi_enable_all_wakeup_gpes();
        acpi_os_wait_events_complete();
-       enable_irq_wake(acpi_gbl_FADT.sci_interrupt);
+       if (acpi_sci_irq_valid())
+               enable_irq_wake(acpi_sci_irq);
        return 0;
 }
 
 static void acpi_freeze_restore(void)
 {
        acpi_disable_wakeup_devices(ACPI_STATE_S0);
-       disable_irq_wake(acpi_gbl_FADT.sci_interrupt);
+       if (acpi_sci_irq_valid())
+               disable_irq_wake(acpi_sci_irq);
        acpi_enable_all_runtime_gpes();
 }