projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Auto-update from upstream
[powerpc.git]
/
drivers
/
acpi
/
sleep
/
poweroff.c
diff --git
a/drivers/acpi/sleep/poweroff.c
b/drivers/acpi/sleep/poweroff.c
index
f8538b5
..
a5f947d
100644
(file)
--- 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)
{
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 = {
}
static struct sysdev_class acpi_sysclass = {