From 03c8f0be2ea2620ec70872c1ef5beb8187565cd6 Mon Sep 17 00:00:00 2001 From: Bob Moore Date: Thu, 10 Apr 2008 19:06:41 +0400 Subject: [PATCH] --- yaml --- r: 95457 b: refs/heads/master c: 549f46044e1e207a2cbfdfb3f9a0d3fd5fd4105e h: refs/heads/master i: 95455: 9a1afb4bbe719d8b45246f22a9b1147ba6c7f7b8 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/namespace/nsxfeval.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b221410391c2..8a8412159467 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a2e71a82375aa2aef571d5fa9064ba67c8856a5 +refs/heads/master: 549f46044e1e207a2cbfdfb3f9a0d3fd5fd4105e diff --git a/trunk/drivers/acpi/namespace/nsxfeval.c b/trunk/drivers/acpi/namespace/nsxfeval.c index b92133faf5b7..cd97c80eb8ee 100644 --- a/trunk/drivers/acpi/namespace/nsxfeval.c +++ b/trunk/drivers/acpi/namespace/nsxfeval.c @@ -467,10 +467,13 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, return (AE_CTRL_DEPTH); } - if (!(flags & ACPI_STA_DEVICE_PRESENT)) { - - /* Don't examine children of the device if not present */ - + if (!(flags & ACPI_STA_DEVICE_PRESENT) && + !(flags & ACPI_STA_DEVICE_FUNCTIONING)) { + /* + * Don't examine the children of the device only when the + * device is neither present nor functional. See ACPI spec, + * description of _STA for more information. + */ return (AE_CTRL_DEPTH); } @@ -539,7 +542,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, * value is returned to the caller. * * This is a wrapper for walk_namespace, but the callback performs - * additional filtering. Please see acpi_get_device_callback. + * additional filtering. Please see acpi_ns_get_device_callback. * ******************************************************************************/