projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
hardware
/
hwsleep.c
diff --git
a/drivers/acpi/hardware/hwsleep.c
b/drivers/acpi/hardware/hwsleep.c
index 57901ca3ade911fea9ae132dd7aa77844025372b..8fa93125fd4c94af822bf9b6dd1863511de16b7a 100644
(file)
--- a/
drivers/acpi/hardware/hwsleep.c
+++ b/
drivers/acpi/hardware/hwsleep.c
@@
-235,6
+235,14
@@
acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
"While executing method _SST"));
}
"While executing method _SST"));
}
+ /*
+ * 1) Disable/Clear all GPEs
+ */
+ status = acpi_hw_disable_all_gpes();
+ if (ACPI_FAILURE(status)) {
+ return_ACPI_STATUS(status);
+ }
+
return_ACPI_STATUS(AE_OK);
}
return_ACPI_STATUS(AE_OK);
}
@@
-290,13
+298,8
@@
acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
}
/*
}
/*
- * 1) Disable/Clear all GPEs
* 2) Enable all wakeup GPEs
*/
* 2) Enable all wakeup GPEs
*/
- status = acpi_hw_disable_all_gpes();
- if (ACPI_FAILURE(status)) {
- return_ACPI_STATUS(status);
- }
acpi_gbl_system_awake_and_running = FALSE;
status = acpi_hw_enable_all_wakeup_gpes();
acpi_gbl_system_awake_and_running = FALSE;
status = acpi_hw_enable_all_wakeup_gpes();