From 57aef806e0aa68de450f7911560036594871db24 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 25 Jul 2001 22:10:56 +0000 Subject: Commit the hwsleep.c patch for suspend/resume onto the vendor branch. This has supposedly been incorporated into the Intel code already, so this will get cleanly replaced with the "official" version when it is next imported and will not cause any conflicts or hiccups. --- sys/contrib/dev/acpica/hwsleep.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'sys/contrib/dev') diff --git a/sys/contrib/dev/acpica/hwsleep.c b/sys/contrib/dev/acpica/hwsleep.c index cc4aae2..494d37d 100644 --- a/sys/contrib/dev/acpica/hwsleep.c +++ b/sys/contrib/dev/acpica/hwsleep.c @@ -298,8 +298,10 @@ AcpiEnterSleepState ( /* wait a second, then try again */ AcpiOsStall(1000000); - AcpiHwRegisterWrite(ACPI_MTX_LOCK, PM1_CONTROL, - (1 << AcpiHwGetBitShift (SLP_EN_MASK))); + if (SleepState > ACPI_STATE_S1) { + AcpiHwRegisterWrite(ACPI_MTX_LOCK, PM1_CONTROL, + (1 << AcpiHwGetBitShift (SLP_EN_MASK))); + } enable(); -- cgit v1.1