svn commit: r209747 - head/sys/dev/acpica

Jung-uk Kim jkim at FreeBSD.org
Tue Jul 6 21:41:08 UTC 2010


Author: jkim
Date: Tue Jul  6 21:41:08 2010
New Revision: 209747
URL: http://svn.freebsd.org/changeset/base/209747

Log:
  Fix mis-merges in the previous commit.

Modified:
  head/sys/dev/acpica/acpi.c

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Tue Jul  6 20:57:28 2010	(r209746)
+++ head/sys/dev/acpica/acpi.c	Tue Jul  6 21:41:08 2010	(r209747)
@@ -2690,7 +2690,7 @@ acpi_wake_sleep_prep(ACPI_HANDLE handle,
      * 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, i
      * 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 {


More information about the svn-src-all mailing list