From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Rafael J. Wysocki" Subject: Re: [PATCH] Power Hibernate: (bugfix) when failed, "in_suspend" should be reset. Date: Fri, 26 Nov 2010 23:08:26 +0100 Message-ID: <201011262308.26332.rjw@sisk.pl> References: <1290762713-23616-1-git-send-email-myungjoo.ham@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1290762713-23616-1-git-send-email-myungjoo.ham@samsung.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: MyungJoo Ham Cc: Len Brown , kyungmin.park@samsung.com, myungjoo.ham@gmail.com, linux-pm@lists.linux-foundation.org, Andrew Morton List-Id: linux-pm@vger.kernel.org On Friday, November 26, 2010, MyungJoo Ham wrote: > When hibernation failed due to an error in swsusp_write() called by > hibernate(), it skips calling "power_down()" and returns. When > hibernate() is called again (probably after fixing up so that > swsusp_write() wouldn't fail again), before "in_suspend = 1" of > create_image is called, in_suspend should be 0. However, because > hibernate() did not reset "in_suspend" after a failure, it's already 1. > > This patch fixes such inconsistency of "in_suspend" value. Applied to suspend-2.6/linux-next. Thanks, Rafael > Signed-off-by: MyungJoo Ham > Signed-off-by: Kyungmin Park > --- > kernel/power/hibernate.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c > index e6c498d..e27bf22 100644 > --- a/kernel/power/hibernate.c > +++ b/kernel/power/hibernate.c > @@ -643,6 +643,7 @@ int hibernate(void) > swsusp_free(); > if (!error) > power_down(); > + in_suspend = 0; > } else { > pr_debug("PM: Image restored successfully.\n"); > } >