---

yaml --- r: 33426 b: refs/heads/master c: 5672bde h: refs/heads/master v: v3
git-mirror · Aug 16, 2006 · 11cbcfd · 11cbcfd
1 parent c0c94d9
commit 11cbcfd
Show file tree

Hide file tree

Showing 3 changed files with 121 additions and 167 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e6e6504a4572dee3afcb0925ce92ad559e1e0db
+refs/heads/master: 5672bde6355f2d12c49df1eec083d25afe489063
diff --git a/trunk/arch/i386/kernel/acpi/wakeup.S b/trunk/arch/i386/kernel/acpi/wakeup.S
@@ -292,10 +292,7 @@ ENTRY(do_suspend_lowlevel)
 	pushl	$3
 	call	acpi_enter_sleep_state
 	addl	$4, %esp
-
-#	In case of S3 failure, we'll emerge here.  Jump
-# 	to ret_point to recover
-	jmp	ret_point
+	ret
 	.p2align 4,,7
 ret_point:
 	call	restore_registers