diff options
| author | Len Brown <len.brown@intel.com> | 2010-08-15 04:25:40 (GMT) |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-08-15 04:25:40 (GMT) |
| commit | c172cb73bc79fe69915b1a1a48e374aa4b1f8a59 (patch) | |
| tree | eb3d6415914968441c063f7282e824b14b5a5edb /drivers/acpi/acpica/nsnames.c | |
| parent | e8eb6228094bcf0c84d9aa32b6363e78da68e1f5 (diff) | |
| parent | 28f4f8a9def2b1f3a6066bae791c77043ec49524 (diff) | |
| download | linux-fsl-qoriq-c172cb73bc79fe69915b1a1a48e374aa4b1f8a59.tar.xz | |
Merge branch 'acpica-gpe' into release
Diffstat (limited to 'drivers/acpi/acpica/nsnames.c')
| -rw-r--r-- | drivers/acpi/acpica/nsnames.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/nsnames.c b/drivers/acpi/acpica/nsnames.c index 7dea003..d3104af 100644 --- a/drivers/acpi/acpica/nsnames.c +++ b/drivers/acpi/acpica/nsnames.c @@ -93,7 +93,7 @@ acpi_ns_build_external_path(struct acpi_namespace_node *node, /* Put the name into the buffer */ ACPI_MOVE_32_TO_32((name_buffer + index), &parent_node->name); - parent_node = acpi_ns_get_parent_node(parent_node); + parent_node = parent_node->parent; /* Prefix name with the path separator */ @@ -198,7 +198,7 @@ acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node) return 0; } size += ACPI_PATH_SEGMENT_LENGTH; - next_node = acpi_ns_get_parent_node(next_node); + next_node = next_node->parent; } if (!size) { |