diff options
| author | Bob Moore <robert.moore@intel.com> | 2008-04-10 17:06:41 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-22 20:29:28 +0200 |
| commit | 549f46044e1e207a2cbfdfb3f9a0d3fd5fd4105e (patch) | |
| tree | 7f18ff91ea39569f905cb20ad1410f51c4437f56 /drivers/acpi/namespace | |
| parent | ACPICA: Update version to 20071114 (diff) | |
| download | linux-549f46044e1e207a2cbfdfb3f9a0d3fd5fd4105e.tar.xz linux-549f46044e1e207a2cbfdfb3f9a0d3fd5fd4105e.zip | |
ACPICA: Fixed a problem with AcpiGetDevices where the search of a branch of the device tree could be terminated prematurely
In accordance with the ACPI specification, the search is terminated
if a device is both not present and not functional (instead of
just not present.) Yakui Zhao.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/namespace')
| -rw-r--r-- | drivers/acpi/namespace/nsxfeval.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c index b92133faf5b7..cd97c80eb8ee 100644 --- a/drivers/acpi/namespace/nsxfeval.c +++ b/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. * ******************************************************************************/ |