tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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 <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by

Eric W. Biederman and committed by
Linus Torvalds 8dbddf17 6a029a90

+5 -1
+5 -1
drivers/acpi/sleep/poweroff.c
··· 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 = {