From 2da3c85cc59ecc2a6a3445717a3faef8479ca18d Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Tue, 8 Feb 2011 23:42:09 +0100
Subject: [PATCH] --- yaml --- r: 241679 b: refs/heads/master c:
 979f11b060c0b35b03b86ae854d6f21a710305d0 h: refs/heads/master i:   241677:
 b6f620ac12a6f9db6afb75694ee8addf6600b8b8   241675:
 a84342f95cba2be19a9990f071fb30eb510c1e55   241671:
 143899c7b517c00e8e1a2482dc8840bcab8da313   241663:
 83152cc060e8515b41cdeca93ae672cd223af763 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/acpi/sleep.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e130929abf75..3c0bd9fbb212 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a63f08b2b904d25e966dd0e15c9af4a13c80b90
+refs/heads/master: 979f11b060c0b35b03b86ae854d6f21a710305d0
diff --git a/trunk/drivers/acpi/sleep.c b/trunk/drivers/acpi/sleep.c
index 6bea2fe8434b..2307604064b3 100644
--- a/trunk/drivers/acpi/sleep.c
+++ b/trunk/drivers/acpi/sleep.c
@@ -244,17 +244,10 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 {
 	acpi_status status = AE_OK;
 	u32 acpi_state = acpi_target_sleep_state;
+	int error;
 
 	ACPI_FLUSH_CPU_CACHE();
 
-	/* Do arch specific saving of state. */
-	if (acpi_state == ACPI_STATE_S3) {
-		int error = acpi_save_state_mem();
-
-		if (error)
-			return error;
-	}
-
 	switch (acpi_state) {
 	case ACPI_STATE_S1:
 		barrier();
@@ -262,6 +255,9 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
 		break;
 
 	case ACPI_STATE_S3:
+		error = acpi_save_state_mem();
+		if (error)
+			return error;
 		do_suspend_lowlevel();
 		pr_info(PREFIX "Low-level resume complete\n");
 		break;