OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
13a4bdf
)
fix S3 suspend and resume
author
Yi Sun
<beyounn@gmail.com>
Thu, 2 Jul 2009 08:59:56 +0000
(16:59 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Thu, 31 Mar 2011 02:03:12 +0000
(10:03 +0800)
drivers/acpi/sleep.c
patch
|
blob
|
history
diff --git
a/drivers/acpi/sleep.c
b/drivers/acpi/sleep.c
index
d6a8cd1
..
efd2360
100644
(file)
--- a/
drivers/acpi/sleep.c
+++ b/
drivers/acpi/sleep.c
@@
-155,6
+155,7
@@
static int acpi_pm_prepare(void)
return error;
}
+extern void request_suspend_state(int);
/**
* acpi_pm_finish - Instruct the platform to leave a sleep state.
*
@@
-175,6
+176,8
@@
static void acpi_pm_finish(void)
acpi_state);
acpi_disable_wakeup_devices(acpi_state);
acpi_leave_sleep_state(acpi_state);
+ if (acpi_state == ACPI_STATE_S3)
+ request_suspend_state(0);
/* reset firmware waking vector */
acpi_set_firmware_waking_vector((acpi_physical_address) 0);