diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-05 02:40:11 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-05 02:40:11 -0500 |
| commit | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (patch) | |
| tree | 7b50020df7552127d309d1bbc2f248ce6099219b | |
| parent | 3173cdfe02995f6c6841a28b5148f94cefd8ab77 (diff) | |
| download | linux-3.10-ed349a8a0a780ed27e2a765f16cee54d9b63bfee.tar.gz linux-3.10-ed349a8a0a780ed27e2a765f16cee54d9b63bfee.tar.bz2 linux-3.10-ed349a8a0a780ed27e2a765f16cee54d9b63bfee.zip | |
[ACPI] fix pnpacpi regression resulting from ACPICA 20051117
In ACPICA 20051117, acpi_walk_resources() started
sending ACPI_RESOURCE_TYPE_END_TAG to the callback
routine which wasn't prepared for it, causing
_CRS to fail and PnPACPI to not recognize any devices:
pnp: ACPI device : hid PNP0C02
pnp: PnPACPI: unknown resource type 7
pnp: PnPACPI: METHOD_NAME__CRS failure for PNP0c02
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/resources/rsxface.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/acpi/resources/rsxface.c b/drivers/acpi/resources/rsxface.c index 50a956b705b..5408e5d10cc 100644 --- a/drivers/acpi/resources/rsxface.c +++ b/drivers/acpi/resources/rsxface.c @@ -286,6 +286,12 @@ acpi_walk_resources(acpi_handle device_handle, break; } + /* end_tag indicates end-of-list */ + + if (resource->type == ACPI_RESOURCE_TYPE_END_TAG) { + break; + } + /* Invoke the user function, abort on any error returned */ status = user_function(resource, context); @@ -298,12 +304,6 @@ acpi_walk_resources(acpi_handle device_handle, break; } - /* end_tag indicates end-of-list */ - - if (resource->type == ACPI_RESOURCE_TYPE_END_TAG) { - break; - } - /* Get the next resource descriptor */ resource = |