From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Machek Subject: Re: [PATCH] Power Hibernate: hibernation_ops->leave should be checked as well. Date: Fri, 26 Nov 2010 06:41:36 +0100 Message-ID: <20101126054135.GA1939@elf.ucw.cz> References: <1290748003-26125-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: Content-Disposition: inline In-Reply-To: <1290748003-26125-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 Fri 2010-11-26 14:06:43, MyungJoo Ham wrote: > Because hibernate calls hibernation_ops->leave() without checking > whether hibernation_ops->leave is NULL or not, hiberantion_set_ops > should WARN_ON if hibernation_ops->leave is NULL. > > This patch added one more condition to check hibernation_ops->leave. > > Signed-off-by: MyungJoo Ham > Signed-off-by: Kyungmin Park ACK. > --- > kernel/power/hibernate.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c > index 8dc31e0..e6c498d 100644 > --- a/kernel/power/hibernate.c > +++ b/kernel/power/hibernate.c > @@ -61,7 +61,7 @@ void hibernation_set_ops(struct platform_hibernation_ops *ops) > { > if (ops && !(ops->begin && ops->end && ops->pre_snapshot > && ops->prepare && ops->finish && ops->enter && ops->pre_restore > - && ops->restore_cleanup)) { > + && ops->restore_cleanup && ops->leave)) { > WARN_ON(1); > return; > } -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html