diff options
| author | Matthew Garrett <mjg59@srcf.ucam.org> | 2008-08-06 19:12:04 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-16 14:17:06 -0400 |
| commit | a68823ee5285e65b51ceb96f8b13a5b4f99a6888 (patch) | |
| tree | 95ac0c8d54b0a358efb1dee9f9a0478a09657075 | |
| parent | 3fa8749e584b55f1180411ab1b51117190bac1e5 (diff) | |
| download | linux-a68823ee5285e65b51ceb96f8b13a5b4f99a6888.tar.gz linux-a68823ee5285e65b51ceb96f8b13a5b4f99a6888.tar.bz2 linux-a68823ee5285e65b51ceb96f8b13a5b4f99a6888.zip | |
ACPI: Clear WAK_STS on resume
The leading other brand OS appears to clear the WAK_STS flag on resume.
When rebooted, certain BIOSes assume that the system is actually
resuming if it's still set and so fail to reboot correctly. Make sure
that it's cleared at resume time.
Comment clarified as suggested by Bob Moore
http://bugzilla.kernel.org/show_bug.cgi?id=11634
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Tested-by: Romano Giannetti <romano.giannetti@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/hardware/hwsleep.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/hardware/hwsleep.c b/drivers/acpi/hardware/hwsleep.c index dba3cfbe8cba..130a44b79687 100644 --- a/drivers/acpi/hardware/hwsleep.c +++ b/drivers/acpi/hardware/hwsleep.c @@ -627,6 +627,13 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state) } /* TBD: _WAK "sometimes" returns stuff - do we want to look at it? */ + /* + * Some BIOSes assume that WAK_STS will be cleared on resume and use + * it to determine whether the system is rebooting or resuming. Clear + * it for compatibility. + */ + acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1); + acpi_gbl_system_awake_and_running = TRUE; /* Enable power button */ |