diff options
| author | peter <peter@FreeBSD.org> | 2001-07-25 22:10:56 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2001-07-25 22:10:56 +0000 |
| commit | 57aef806e0aa68de450f7911560036594871db24 (patch) | |
| tree | b6571e7f45e5426bb652ab51f3c8e91435a4264f /sys/contrib/dev | |
| parent | 91b87ce244ba7faf775a62956dc8b93fefc09941 (diff) | |
| download | FreeBSD-src-57aef806e0aa68de450f7911560036594871db24.zip FreeBSD-src-57aef806e0aa68de450f7911560036594871db24.tar.gz | |
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.
Diffstat (limited to 'sys/contrib/dev')
| -rw-r--r-- | sys/contrib/dev/acpica/hwsleep.c | 6 |
1 files changed, 4 insertions, 2 deletions
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(); |
