summaryrefslogtreecommitdiffstats
path: root/kernel/power/main.c
diff options
context:
space:
mode:
authorAlexey Starikovskiy2005-03-18 22:20:46 +0100
committerLen Brown2005-07-12 05:20:49 +0200
commite2a5b420f716cd1a46674b1a90389612eced916f (patch)
tree96f363f2e402d53428c046269514a82856b0cb34 /kernel/power/main.c
parent[ACPI] CONFIG_ACPI now depends on CONFIG_PM (diff)
downloadkernel-qcow2-linux-e2a5b420f716cd1a46674b1a90389612eced916f.tar.gz
kernel-qcow2-linux-e2a5b420f716cd1a46674b1a90389612eced916f.tar.xz
kernel-qcow2-linux-e2a5b420f716cd1a46674b1a90389612eced916f.zip
[ACPI] ACPI poweroff fix
Register an "acpi" system device to be notified of shutdown preparation. This depends on CONFIG_PM http://bugzilla.kernel.org/show_bug.cgi?id=4041 Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power/main.c')
-rw-r--r--kernel/power/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 4cdebc972ff2..c7eb4a833db5 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -190,7 +190,7 @@ int software_suspend(void)
int pm_suspend(suspend_state_t state)
{
- if (state > PM_SUSPEND_ON && state < PM_SUSPEND_MAX)
+ if (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX)
return enter_state(state);
return -EINVAL;
}