summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorjmcneill <jmcneill@NetBSD.org>2007-12-14 01:29:29 +0000
committerjmcneill <jmcneill@NetBSD.org>2007-12-14 01:29:29 +0000
commite692a6c76aa4426238cded9ce5682f8289bfb560 (patch)
tree29c16909820a02e8fe172a29f7c9ff9c51c3c887 /sys/dev
parent4a77686dd96ef20ebc830e3bae0f07fcb16517d6 (diff)
Introduce pmf_system_bus_resume. In the ACPI S3 resume path, use this to
separate powering up devices from restoring their state. This is required on some machines where AcpiLeaveSleepState can fail due to an attempt to access a powered off device.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/acpi/acpi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c
index 03868541441..1da9bcf12e3 100644
--- a/sys/dev/acpi/acpi.c
+++ b/sys/dev/acpi/acpi.c
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.105 2007/12/10 22:56:29 reinoud Exp $ */
+/* $NetBSD: acpi.c,v 1.106 2007/12/14 01:29:29 jmcneill Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.105 2007/12/10 22:56:29 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.106 2007/12/14 01:29:29 jmcneill Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -1202,6 +1202,7 @@ acpi_enter_sleep_state(struct acpi_softc *sc, int state)
err = acpi_md_sleep(state);
if (state == ACPI_STATE_S4)
AcpiEnable();
+ pmf_system_bus_resume();
AcpiLeaveSleepState((UINT8)state);
pmf_system_resume();
}