Author: richard
Date: Mon May 18 14:33:21 2009
New Revision: 5771
URL: http://svn.slimdevices.com/jive?rev=5771&view=rev
Log:
Bug: 11824
Description:
Possible fix for crasher on resume.
Modified:
7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
Modified:
7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
URL:
http://svn.slimdevices.com/jive/7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c?rev=5771&r1=5770&r2=5771&view=diff
==============================================================================
--- 7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c
(original)
+++ 7.3/trunk/squeezeos/src/s3c2412/linux-2.6.22/arch/arm/plat-s3c24xx/pm.c Mon
May 18 14:33:21 2009
@@ -120,7 +120,6 @@
SAVE_ITEM(S3C2410_DCLKCON),
};
-#define CONFIG_S3C2410_PM_DEBUG
#ifdef CONFIG_S3C2410_PM_DEBUG
#define SAVE_UART(va) \
@@ -641,7 +640,8 @@
s3c2410_pm_enter(state);
/* woken by rtc? */
- rtc_wakeup = (__raw_readl(S3C2410_SRCPND) == 0);
+ rtc_wakeup = (__raw_readl(S3C2410_SRCPND) == 0 &&
+ __raw_readl(S3C2410_EINTPEND) == 0);
/* check battery */
bat_flat = jive_is_battery_flat(&bat_lvl);
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
