From fdbe87fc137fbba15ffbc1de099beefc511993af Mon Sep 17 00:00:00 2001
From: "Eric W. Biederman" <ebiederm@xmission.com>
Date: Sat, 27 Aug 2005 00:56:18 -0600
Subject: [PATCH] --- yaml --- r: 6023 b: refs/heads/master c:
 8dbddf17824861f2298de093549e6493d9844835 h: refs/heads/master i:   6021:
 b0504a3783cc75dbb4890ab53c52723890f7e212   6019:
 6918bda511a97afe71761aa499f9f1a99e0124d1   6015:
 a78646e754126fe14f54c36038fdcf5523f8104b v: v3

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

diff --git a/[refs] b/[refs]
index 4d1e75b302e1..5162668d2600 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a029a90f5b93e2b50bcbbaef05ef91fa0c1d6b3
+refs/heads/master: 8dbddf17824861f2298de093549e6493d9844835
diff --git a/trunk/drivers/acpi/sleep/poweroff.c b/trunk/drivers/acpi/sleep/poweroff.c
index 186b182c5825..f93d2ee54800 100644
--- a/trunk/drivers/acpi/sleep/poweroff.c
+++ b/trunk/drivers/acpi/sleep/poweroff.c
@@ -55,7 +55,11 @@ void acpi_power_off(void)
 
 static int acpi_shutdown(struct sys_device *x)
 {
-	return acpi_sleep_prepare(ACPI_STATE_S5);
+	if (system_state == SYSTEM_POWER_OFF) {
+		/* Prepare if we are going to power off the system */
+		return acpi_sleep_prepare(ACPI_STATE_S5);
+	}
+	return 0;
 }
 
 static struct sysdev_class acpi_sysclass = {