projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
kernel
/
power
/
main.c
diff --git
a/kernel/power/main.c
b/kernel/power/main.c
index
ee371f5
..
0a907f0
100644
(file)
--- a/
kernel/power/main.c
+++ b/
kernel/power/main.c
@@
-86,6
+86,7
@@
static int suspend_prepare(suspend_state_t state)
goto Thaw;
}
goto Thaw;
}
+ suspend_console();
if ((error = device_suspend(PMSG_SUSPEND))) {
printk(KERN_ERR "Some devices failed to suspend\n");
goto Finish;
if ((error = device_suspend(PMSG_SUSPEND))) {
printk(KERN_ERR "Some devices failed to suspend\n");
goto Finish;
@@
-133,6
+134,7
@@
int suspend_enter(suspend_state_t state)
static void suspend_finish(suspend_state_t state)
{
device_resume();
static void suspend_finish(suspend_state_t state)
{
device_resume();
+ resume_console();
thaw_processes();
enable_nonboot_cpus();
if (pm_ops && pm_ops->finish)
thaw_processes();
enable_nonboot_cpus();
if (pm_ops && pm_ops->finish)
@@
-272,7
+274,7
@@
static ssize_t state_store(struct subsystem * subsys, const char * buf, size_t n
if (*s && !strncmp(buf, *s, len))
break;
}
if (*s && !strncmp(buf, *s, len))
break;
}
- if (*s)
+ if (
state < PM_SUSPEND_MAX &&
*s)
error = enter_state(state);
else
error = -EINVAL;
error = enter_state(state);
else
error = -EINVAL;