From 4f12dbc3f61dbfa5e3322b352723078db101c3cb Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 25 Jul 2001 22:10:56 +0000
Subject: [PATCH] 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(-)

diff --git a/sys/contrib/dev/acpica/hwsleep.c b/sys/contrib/dev/acpica/hwsleep.c
index cc4aae2761d3..494d37dd3dda 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();