diff options
author | njl <njl@FreeBSD.org> | 2004-04-14 16:52:19 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2004-04-14 16:52:19 +0000 |
commit | e3d67bca303a9687d62f8421f4d2c32477004c03 (patch) | |
tree | a79e9058a34ff1485889e10b4d490d95d8ff997c /sys/contrib/dev/acpica | |
parent | 4dd0ef2568c0be2fee5fa79a7c03cc685c59e5f2 (diff) | |
download | FreeBSD-src-e3d67bca303a9687d62f8421f4d2c32477004c03.zip FreeBSD-src-e3d67bca303a9687d62f8421f4d2c32477004c03.tar.gz |
Even though the patch has been submitted to the vendor, this file is off
the vendor branch. Once more, with feeling!
Diffstat (limited to 'sys/contrib/dev/acpica')
-rw-r--r-- | sys/contrib/dev/acpica/hwsleep.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/contrib/dev/acpica/hwsleep.c b/sys/contrib/dev/acpica/hwsleep.c index c3a7b37..d3c9841 100644 --- a/sys/contrib/dev/acpica/hwsleep.c +++ b/sys/contrib/dev/acpica/hwsleep.c @@ -350,22 +350,22 @@ AcpiEnterSleepState ( SleepTypeRegInfo = AcpiHwGetBitRegisterInfo (ACPI_BITREG_SLEEP_TYPE_A); SleepEnableRegInfo = AcpiHwGetBitRegisterInfo (ACPI_BITREG_SLEEP_ENABLE); - if (SleepState != ACPI_STATE_S5) - { - /* Clear wake status */ + /* Clear wake status */ - Status = AcpiSetRegister (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + Status = AcpiSetRegister (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } - Status = AcpiHwClearAcpiStatus (ACPI_MTX_DO_NOT_LOCK); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + Status = AcpiHwClearAcpiStatus (ACPI_MTX_DO_NOT_LOCK); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + if (SleepState != ACPI_STATE_S5) + { /* Disable BM arbitration */ Status = AcpiSetRegister (ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK); |