projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
kernel
/
power
/
console.c
diff --git
a/kernel/power/console.c
b/kernel/power/console.c
index
623786d
..
89bcf49
100644
(file)
--- a/
kernel/power/console.c
+++ b/
kernel/power/console.c
@@
-27,7
+27,15
@@
int pm_prepare_console(void)
return 1;
}
return 1;
}
- set_console(SUSPEND_CONSOLE);
+ if (set_console(SUSPEND_CONSOLE)) {
+ /*
+ * We're unable to switch to the SUSPEND_CONSOLE.
+ * Let the calling function know so it can decide
+ * what to do.
+ */
+ release_console_sem();
+ return 1;
+ }
release_console_sem();
if (vt_waitactive(SUSPEND_CONSOLE)) {
release_console_sem();
if (vt_waitactive(SUSPEND_CONSOLE)) {