diff options
author | Len Brown <len.brown@intel.com> | 2006-01-16 15:22:45 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-01-16 15:22:45 -0500 |
commit | 2ae4117435b30c7f9c12c89bcb323ce48b08c16a (patch) | |
tree | 2276595ca0eb0dbec113959f835db2a490a16dcb | |
parent | 3963f00831bc01f509c7dc38d050505fca64f67d (diff) |
Revert "[ACPI] fix pnpacpi regression resulting from ACPICA 20051117"
This reverts ed349a8a0a780ed27e2a765f16cee54d9b63bfee commit.
-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 5408e5d10cc3..50a956b705b0 100644 --- a/drivers/acpi/resources/rsxface.c +++ b/drivers/acpi/resources/rsxface.c | |||
@@ -286,12 +286,6 @@ 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 | |||
295 | /* Invoke the user function, abort on any error returned */ | 289 | /* Invoke the user function, abort on any error returned */ |
296 | 290 | ||
297 | status = user_function(resource, context); | 291 | status = user_function(resource, context); |
@@ -304,6 +298,12 @@ acpi_walk_resources(acpi_handle device_handle, | |||
304 | break; | 298 | break; |
305 | } | 299 | } |
306 | 300 | ||
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 = |