aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/acpica
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2013-01-17 23:56:43 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2013-01-17 23:56:43 +0000
commitefcc2a30547c400649a351e85e6cd97dab8f3817 (patch)
treea7cdf321edb5a438878660c0df9e9bf8a70038e1 /sys/dev/acpica
parent70ca194a4c1c64dc90c9fd546d333072a0f9f477 (diff)
parentb28e481ae9b051dab150e9b5a89730cdc1103a9c (diff)
downloadsrc-efcc2a30547c400649a351e85e6cd97dab8f3817.tar.gz
src-efcc2a30547c400649a351e85e6cd97dab8f3817.zip
Merge ACPICA 20130117.
Notes
Notes: svn path=/head/; revision=245582
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 e2f8c1c64379..b5ce09f973e0 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;
/*