Index: acpi.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/acpica/acpi.c,v
retrieving revision 1.305.2.7
diff -u -r1.305.2.7 acpi.c
--- acpi.c	1 Jun 2012 12:47:13 -0000	1.305.2.7
+++ acpi.c	22 Jun 2012 16:46:24 -0000
@@ -2755,12 +2811,15 @@
      * process.  This handles both the error and success cases.
      */
 backout:
+    /*ACPI_SLEEP_DEBUG_PRINT(sc, "acpi_wake_prep_walk");*/
     if (slp_state >= ACPI_SS_GPE_SET) {
 	acpi_wake_prep_walk(state);
 	sc->acpi_sstate = ACPI_STATE_S0;
     }
+    /*ACPI_SLEEP_DEBUG_PRINT(sc, "DEVICE_RESUME");*/
     if (slp_state >= ACPI_SS_DEV_SUSPEND)
 	DEVICE_RESUME(root_bus);
+    ACPI_SLEEP_DEBUG_PRINT(sc, "AcpiLeaveSleepState");
     if (slp_state >= ACPI_SS_SLP_PREP)
 	AcpiLeaveSleepState(state);
     if (slp_state >= ACPI_SS_SLEPT) {
@@ -2786,6 +2845,7 @@
     if (devctl_process_running())
 	acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, state);
 
+    ACPI_SLEEP_DEBUG_RESET(sc);
     return_ACPI_STATUS (status);
 }