commit 5eb38f44839ec1aade167b125d86d265c886c195
author Russell King <rmk@dyn-67.arm.linux.org.uk> Tue Sep 08 11:23:24 2009 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Tue Sep 08 11:23:24 2009 +0100
tree 5e87a97f331d2e07d36260f9b3eec4971366363b
parent 56ddf7e6d4f69d7ce9f1c484b62e99d6b029e6f8
parent 99f329a2ba3c2d07cc90ca9309babf27ddf98bff

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

arch/arm/mach-pxa/sharpsl_pm.c

diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 2546c06..629e05d 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -678,8 +678,8 @@
 		dev_dbg(sharpsl_pm.dev, "User triggered wakeup in offline charger.\n");
 	}
 
-	if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || (sharpsl_fatal_check() < 0) )
-	{
+	if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) ||
+	    (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_FATAL)))	{
 		dev_err(sharpsl_pm.dev, "Fatal condition. Suspend.\n");
 		corgi_goto_sleep(alarm_time, alarm_enable, state);
 		return 1;