diff options
| author | njl <njl@FreeBSD.org> | 2004-08-18 07:00:43 +0000 |
|---|---|---|
| committer | njl <njl@FreeBSD.org> | 2004-08-18 07:00:43 +0000 |
| commit | 9cd2b5cc3b371a86d3689648712b30d0db30e023 (patch) | |
| tree | 0005034bc12cbd1dfc31b70898368387ed6c6a37 /sys/dev | |
| parent | 75f12cc1b845dff2facb164af7389aa5541337e6 (diff) | |
| download | FreeBSD-src-9cd2b5cc3b371a86d3689648712b30d0db30e023.zip FreeBSD-src-9cd2b5cc3b371a86d3689648712b30d0db30e023.tar.gz | |
Call AcpiLeaveSleepState() before DEVICE_RESUME(). The former calls the
BFS and WAK methods, which are needed to initialize some devices before
the driver can resume them. This was the original order.
MFC after: 2 days
Diffstat (limited to 'sys/dev')
| -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 8176ef2..74390d6 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1837,10 +1837,10 @@ acpi_SetSleepState(struct acpi_softc *sc, int state) acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; } - if (slp_state >= ACPI_SS_DEV_SUSPEND) - DEVICE_RESUME(root_bus); if (slp_state >= ACPI_SS_SLP_PREP) AcpiLeaveSleepState(state); + if (slp_state >= ACPI_SS_DEV_SUSPEND) + DEVICE_RESUME(root_bus); if (slp_state >= ACPI_SS_SLEPT) acpi_enable_fixed_events(sc); |
