[PATCH] acpi_shutdown: Only prepare for power off on power_off

ebiederm · Linus Torvalds · commit 8dbddf178248 · 2005-08-27T10:11:40.000-07:00
When acpi_sleep_prepare was moved into a shutdown method we
started calling it for all shutdowns.

It appears this triggers some systems to power off on reboot.

Avoid this by only calling acpi_sleep_prepare if we are going to power
off the system.

Signed-off-by: Eric W. Biederman &lt;ebiederm@xmission.com&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git a/drivers/acpi/sleep/poweroff.c b/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 = {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,11 @@ void acpi_power_off(void)`
`55`	`55`
`56`	`56`	`static int acpi_shutdown(struct sys_device *x)`
`57`	`57`	`{`
`58`		`- return acpi_sleep_prepare(ACPI_STATE_S5);`
	`58`	`+ if (system_state == SYSTEM_POWER_OFF) {`
	`59`	`+ /* Prepare if we are going to power off the system */`
	`60`	`+ return acpi_sleep_prepare(ACPI_STATE_S5);`
	`61`	`+ }`
	`62`	`+ return 0;`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	`static struct sysdev_class acpi_sysclass = {`