diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-08 11:23:24 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-08 11:23:24 +0100 |
| commit | 5eb38f44839ec1aade167b125d86d265c886c195 (patch) | |
| tree | 5e87a97f331d2e07d36260f9b3eec4971366363b /arch/arm | |
| parent | 56ddf7e6d4f69d7ce9f1c484b62e99d6b029e6f8 (diff) | |
| parent | 99f329a2ba3c2d07cc90ca9309babf27ddf98bff (diff) | |
| download | linux-3.10-5eb38f44839ec1aade167b125d86d265c886c195.tar.gz linux-3.10-5eb38f44839ec1aade167b125d86d265c886c195.tar.bz2 linux-3.10-5eb38f44839ec1aade167b125d86d265c886c195.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index 2546c066cd6..629e05d1196 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c @@ -678,8 +678,8 @@ static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enab 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; |