diff options
| author | Arve Hjønnevåg <arve@android.com> | 2008-10-09 19:17:11 -0700 |
|---|---|---|
| committer | Brian Swetland <swetland@google.com> | 2011-03-29 13:57:03 -0700 |
| commit | 50a47b5de26c4bd589c3228aa84d6364cf271154 (patch) | |
| tree | 9e1db62d4b7f5eefc9bbd880f05c5a75ef6fe335 /kernel | |
| parent | 475daf78cfd2bcf709c49a0a06ad22243bab422b (diff) | |
PM: Enable early suspend through /sys/power/state
If EARLYSUSPEND is enabled then writes to /sys/power/state no longer
blocks, and the kernel will try to enter the requested state every
time no wakelocks are held. Write "on" to resume normal operation.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/main.c | 11 | ||||
| -rw-r--r-- | kernel/power/suspend.c | 3 |
2 files changed, 14 insertions, 0 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 701853042c28..12d849019a53 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -173,7 +173,11 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t n) { #ifdef CONFIG_SUSPEND +#ifdef CONFIG_EARLYSUSPEND + suspend_state_t state = PM_SUSPEND_ON; +#else suspend_state_t state = PM_SUSPEND_STANDBY; +#endif const char * const *s; #endif char *p; @@ -195,8 +199,15 @@ static ssize_t state_store(struct kobject *kobj, struct kobj_attribute *attr, break; } if (state < PM_SUSPEND_MAX && *s) +#ifdef CONFIG_EARLYSUSPEND + if (state == PM_SUSPEND_ON || valid_state(state)) { + error = 0; + request_suspend_state(state); + } +#else error = enter_state(state); #endif +#endif Exit: return error ? error : n; diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index de6f86bfa303..7c4cd6a64841 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -27,6 +27,9 @@ #include "power.h" const char *const pm_states[PM_SUSPEND_MAX] = { +#ifdef CONFIG_EARLYSUSPEND + [PM_SUSPEND_ON] = "on", +#endif [PM_SUSPEND_STANDBY] = "standby", [PM_SUSPEND_MEM] = "mem", }; |