summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-01-17 23:56:43 +0000
committerjkim <jkim@FreeBSD.org>2013-01-17 23:56:43 +0000
commit2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4 (patch)
treea7cdf321edb5a438878660c0df9e9bf8a70038e1 /sys/dev/acpica
parent39b667a9d0968b8b54185d03b5b8bb2670346424 (diff)
parent8f7c8be022add76a280165a4247448f1fcd77631 (diff)
downloadFreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.zip
FreeBSD-src-2a54ee62b3fb5d0e9bf39d81edd2cc14a56166a4.tar.gz
Merge ACPICA 20130117.
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r--sys/dev/acpica/acpi.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index e2f8c1c..b5ce09f 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -613,7 +613,9 @@ acpi_attach(device_t dev)
/* Probe all supported sleep states. */
acpi_sleep_states[ACPI_STATE_S0] = TRUE;
for (state = ACPI_STATE_S1; state < ACPI_S_STATE_COUNT; state++)
- if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB)))
+ if (ACPI_SUCCESS(AcpiEvaluateObject(ACPI_ROOT_OBJECT,
+ __DECONST(char *, AcpiGbl_SleepStateNames[state]), NULL, NULL)) &&
+ ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB)))
acpi_sleep_states[state] = TRUE;
/*
OpenPOWER on IntegriCloud