From: "Rafael J. Wysocki" Subject: [PATCH -mm] Hibernation: Resume consoles if hibernation_platform_enter fails Date: Sat, 15 Sep 2007 21:17:39 +0200 Message-ID: <200709152117.40581.rjw@sisk.pl> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Return-path: Received: from ogre.sisk.pl ([217.79.144.158]:49394 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752204AbXIOTFn (ORCPT ); Sat, 15 Sep 2007 15:05:43 -0400 Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Andrew Morton Cc: Pavel Machek , Len Brown , pm list , ACPI Devel Maling List , LKML [This is a fix on top of hibernation-enter-platform-hibernation-state-in-a-consistent-way-rev-4.patch] --- From: Rafael J. Wysocki If hibernation_platform_enter() fails, consoles should be resumed so that diagnostic information related to the failure is available to the user. Signed-off-by: Rafael J. Wysocki --- kernel/power/disk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Index: linux-2.6.23-rc6/kernel/power/disk.c =================================================================== --- linux-2.6.23-rc6.orig/kernel/power/disk.c +++ linux-2.6.23-rc6/kernel/power/disk.c @@ -293,7 +293,7 @@ int hibernation_platform_enter(void) suspend_console(); error = device_suspend(PMSG_SUSPEND); if (error) - return error; + goto Resume_console; error = hibernation_ops->prepare(); if (error) @@ -320,6 +320,8 @@ int hibernation_platform_enter(void) hibernation_ops->finish(); Resume_devices: device_resume(); + Resume_console: + resume_console(); return error; }