ACPICA: Add starting offset parameter to common dump buffer routine

[deliverable/linux.git] / drivers / acpi / acpica / nsutils.c

diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c
index ef753a41e0872d43649961faf441dd77ad8ff728..0d3d481ce58efb443b56c7f0950f0b84bbe7a75c 100644 (file)
--- a/drivers/acpi/acpica/nsutils.c
+++ b/drivers/acpi/acpica/nsutils.c
@@ -530,7 +530,7 @@ acpi_ns_externalize_name(u32 internal_name_length,
            ((num_segments > 0) ? (num_segments - 1) : 0) + 1;
 
        /*
-        * Check to see if we're still in bounds.  If not, there's a problem
+        * Check to see if we're still in bounds. If not, there's a problem
         * with internal_name (invalid format).
         */
        if (required_length > internal_name_length) {
@@ -557,10 +557,11 @@ acpi_ns_externalize_name(u32 internal_name_length,
                                (*converted_name)[j++] = '.';
                        }
 
-                       (*converted_name)[j++] = internal_name[names_index++];
-                       (*converted_name)[j++] = internal_name[names_index++];
-                       (*converted_name)[j++] = internal_name[names_index++];
-                       (*converted_name)[j++] = internal_name[names_index++];
+                       ACPI_MOVE_NAME(*converted_name, internal_name);
+                       acpi_ut_repair_name(*converted_name);
+
+                       j += ACPI_NAME_SIZE;
+                       names_index += ACPI_NAME_SIZE;
                }
        }
 
@@ -681,7 +682,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
  *                            \ (backslash) and ^ (carat) prefixes, and the
  *                            . (period) to separate segments are supported.
  *              prefix_node  - Root of subtree to be searched, or NS_ALL for the
- *                            root of the name space.  If Name is fully
+ *                            root of the name space. If Name is fully
  *                            qualified (first s8 is '\'), the passed value
  *                            of Scope will not be accessed.
  *              flags       - Used to indicate whether to perform upsearch or
@@ -689,7 +690,7 @@ u32 acpi_ns_opens_scope(acpi_object_type type)
  *              return_node - Where the Node is returned
  *
  * DESCRIPTION: Look up a name relative to a given scope and return the
- *              corresponding Node.  NOTE: Scope can be null.
+ *              corresponding Node. NOTE: Scope can be null.
  *
  * MUTEX:       Locks namespace
  *