projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[powerpc.git]
/
drivers
/
acpi
/
sleep
/
wakeup.c
diff --git
a/drivers/acpi/sleep/wakeup.c
b/drivers/acpi/sleep/wakeup.c
index
4134ed4
..
85df0ce
100644
(file)
--- a/
drivers/acpi/sleep/wakeup.c
+++ b/
drivers/acpi/sleep/wakeup.c
@@
-192,7
+192,7
@@
late_initcall(acpi_wakeup_device_init);
* RUNTIME GPEs, we simply mark all GPES that
* are not enabled for wakeup from S5 as RUNTIME.
*/
* RUNTIME GPEs, we simply mark all GPES that
* are not enabled for wakeup from S5 as RUNTIME.
*/
-void acpi_
wakeup_gpe_poweroff_prepare(void
)
+void acpi_
gpe_sleep_prepare(u32 sleep_state
)
{
struct list_head *node, *next;
{
struct list_head *node, *next;
@@
-201,8
+201,8
@@
void acpi_wakeup_gpe_poweroff_prepare(void)
struct acpi_device,
wakeup_list);
struct acpi_device,
wakeup_list);
- /* The GPE can wakeup system from
S5
, don't touch it */
- if ((u32) dev->wakeup.sleep_state
== ACPI_STATE_S5
)
+ /* The GPE can wakeup system from
this state
, don't touch it */
+ if ((u32) dev->wakeup.sleep_state
>= sleep_state
)
continue;
/* acpi_set_gpe_type will automatically disable GPE */
acpi_set_gpe_type(dev->wakeup.gpe_device,
continue;
/* acpi_set_gpe_type will automatically disable GPE */
acpi_set_gpe_type(dev->wakeup.gpe_device,