diff options
| author | Arve Hjønnevåg <arve@android.com> | 2008-10-09 19:17:11 -0700 |
|---|---|---|
| committer | Arve Hjønnevåg <arve@android.com> | 2010-02-03 21:27:05 -0800 |
| commit | 5f36bdf15970bf5ef97dce533ddac32d85191d6b (patch) | |
| tree | 0cc133b9a29ed5b7ee78c430df226910914260a6 /kernel/power | |
| parent | 74643fdcc38e8806e630cc83ce0f114808ee50ff (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/power')
| -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 347d2cc88cd0..77a3584d253f 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -147,7 +147,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; @@ -169,8 +173,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 6f10dfc2d3e9..cd515ba1c8ce 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -19,6 +19,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", }; |