diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /kernel/power/console.c | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'kernel/power/console.c')
| -rw-r--r-- | kernel/power/console.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index 623786d44159..89bcf4973ee5 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c | |||
| @@ -27,7 +27,15 @@ int pm_prepare_console(void) | |||
| 27 | return 1; | 27 | return 1; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | set_console(SUSPEND_CONSOLE); | 30 | if (set_console(SUSPEND_CONSOLE)) { |
| 31 | /* | ||
| 32 | * We're unable to switch to the SUSPEND_CONSOLE. | ||
| 33 | * Let the calling function know so it can decide | ||
| 34 | * what to do. | ||
| 35 | */ | ||
| 36 | release_console_sem(); | ||
| 37 | return 1; | ||
| 38 | } | ||
| 31 | release_console_sem(); | 39 | release_console_sem(); |
| 32 | 40 | ||
| 33 | if (vt_waitactive(SUSPEND_CONSOLE)) { | 41 | if (vt_waitactive(SUSPEND_CONSOLE)) { |