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 /drivers/acpi | |
parent | 3173cdfe02995f6c6841a28b5148f94cefd8ab77 (diff) |
[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>
Diffstat (limited to 'drivers/acpi')
-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 50a956b705b0..5408e5d10cc3 100644 --- a/drivers/acpi/resources/rsxface.c +++ b/drivers/acpi/resources/rsxface.c | |||
@@ -286,6 +286,12 @@ acpi_walk_resources(acpi_handle device_handle, | |||
286 | break; | 286 | break; |
287 | } | 287 | } |
288 | 288 | ||
289 | /* end_tag indicates end-of-list */ | ||
290 | |||
291 | if (resource->type == ACPI_RESOURCE_TYPE_END_TAG) { | ||
292 | break; | ||
293 | } | ||
294 | |||
289 | /* Invoke the user function, abort on any error returned */ | 295 | /* Invoke the user function, abort on any error returned */ |
290 | 296 | ||
291 | status = user_function(resource, context); | 297 | status = user_function(resource, context); |
@@ -298,12 +304,6 @@ acpi_walk_resources(acpi_handle device_handle, | |||
298 | break; | 304 | break; |
299 | } | 305 | } |
300 | 306 | ||
301 | /* end_tag indicates end-of-list */ | ||
302 | |||
303 | if (resource->type == ACPI_RESOURCE_TYPE_END_TAG) { | ||
304 | break; | ||
305 | } | ||
306 | |||
307 | /* Get the next resource descriptor */ | 307 | /* Get the next resource descriptor */ |
308 | 308 | ||
309 | resource = | 309 | resource = |