diff options
| author | jkim <jkim@FreeBSD.org> | 2010-07-06 21:41:08 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2010-07-06 21:41:08 +0000 |
| commit | 19377b2456e5ebe09cc444908cc267028b85129d (patch) | |
| tree | d40de80b32592ed4cde9f01a48f05cfa6e345a5d | |
| parent | ee32cc37846fecf2cb4ccc3dbb6b5b016d146813 (diff) | |
| download | FreeBSD-src-19377b2456e5ebe09cc444908cc267028b85129d.zip FreeBSD-src-19377b2456e5ebe09cc444908cc267028b85129d.tar.gz | |
Fix mis-merges in the previous commit.
| -rw-r--r-- | sys/dev/acpica/acpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 4a71a50..90ad0e1 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -2690,7 +2690,7 @@ acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate) * and set _PSW. */ if (sstate > prw.lowest_wake) { - AcpiDisableGpe(prw.gpe_handle, prw.gpe_bit); + AcpiGpeWakeup(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_DISABLE); if (bootverbose) device_printf(dev, "wake_prep disabled wake for %s (S%d)\n", acpi_name(handle), sstate); @@ -2727,7 +2727,7 @@ acpi_wake_run_prep(ACPI_HANDLE handle, int sstate) * clear _PSW and turn off any power resources it used. */ if (sstate > prw.lowest_wake) { - AcpiEnableGpe(prw.gpe_handle, prw.gpe_bit); + AcpiGpeWakeup(prw.gpe_handle, prw.gpe_bit, ACPI_GPE_ENABLE); if (bootverbose) device_printf(dev, "run_prep re-enabled %s\n", acpi_name(handle)); } else { |
