diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-08 23:14:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-08 23:14:17 +0200 |
| commit | 63f9ccb89552f25fa8cac57a6796479ca7eb527d (patch) | |
| tree | 6b8286f4d70ccf4f2a5b65764af7887836d02bf1 /kernel/power/console.c | |
| parent | 65c0554b73c920023cc8998802e508b798113b46 (diff) | |
| parent | 307c5971c972ef2bfd541d2850b36a692c6354c9 (diff) | |
| download | linux-63f9ccb89552f25fa8cac57a6796479ca7eb527d.tar.gz linux-63f9ccb89552f25fa8cac57a6796479ca7eb527d.tar.bz2 linux-63f9ccb89552f25fa8cac57a6796479ca7eb527d.zip | |
Merge back earlier suspend/hibernation changes for v4.8.
Diffstat (limited to 'kernel/power/console.c')
| -rw-r--r-- | kernel/power/console.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index aba9c545a0e3..0e781798b0b3 100644 --- a/kernel/power/console.c +++ b/kernel/power/console.c @@ -126,17 +126,17 @@ out: return ret; } -int pm_prepare_console(void) +void pm_prepare_console(void) { if (!pm_vt_switch()) - return 0; + return; orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1); if (orig_fgconsole < 0) - return 1; + return; orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE); - return 0; + return; } void pm_restore_console(void) |