---

yaml --- r: 7089 b: refs/heads/master c: 9bed07d h: refs/heads/master i: 7087: fba4191 v: v3
git-mirror · Sep 3, 2005 · fa89d73 · fa89d73
1 parent 0db536e
commit fa89d73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f36598aeca4c2dbaa607bf6f774e38eb965402f2
+refs/heads/master: 9bed07d0fed01f7c39d128e59e5d35d7d67ff439
diff --git a/trunk/arch/arm/mach-s3c2410/pm.c b/trunk/arch/arm/mach-s3c2410/pm.c
@@ -585,14 +585,16 @@ static int s3c2410_pm_enter(suspend_state_t state)
 
 	s3c2410_pm_check_store();
 
-	// need to make some form of time-delta
-
 	/* send the cpu to sleep... */
 
 	__raw_writel(0x00, S3C2410_CLKCON);  /* turn off clocks over sleep */
 
 	s3c2410_cpu_suspend(regs_save);
 
+	/* restore the cpu state */
+
+	cpu_init();
+
 	/* unset the return-from-sleep flag, to ensure reset */
 
 	tmp = __raw_readl(S3C2410_GSTATUS2);