summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-01-16 21:22:45 +0100
committerLen Brown <len.brown@intel.com>2006-01-16 21:22:45 +0100
commit2ae4117435b30c7f9c12c89bcb323ce48b08c16a (patch)
tree2276595ca0eb0dbec113959f835db2a490a16dcb /drivers/acpi
parent[ACPI] acpi_memhotplug.c build fix (diff)
downloadlinux-2ae4117435b30c7f9c12c89bcb323ce48b08c16a.tar.xz
linux-2ae4117435b30c7f9c12c89bcb323ce48b08c16a.zip
Revert "[ACPI] fix pnpacpi regression resulting from ACPICA 20051117"
This reverts ed349a8a0a780ed27e2a765f16cee54d9b63bfee commit.
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/resources/rsxface.c12
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,
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);
@@ -304,6 +298,12 @@ 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 =