diff options
author | Bob Moore <robert.moore@intel.com> | 2012-10-30 22:28:19 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-14 18:31:29 -0500 |
commit | 47abd13ccfa140ad34620b343bf0e6eca15ed8e8 (patch) | |
tree | 245e4fafdf7a6be655e97524ae13d0e29696eb13 | |
parent | 97171c6be3088a68b403c7285d34c151f7dbfb18 (diff) |
ACPICA: Fix externalize name to complete migration to ACPI_MOVE_NAME
Fix for name segment copy and validation.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r-- | drivers/acpi/acpica/nsutils.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/nsutils.c b/drivers/acpi/acpica/nsutils.c index 0d3d481ce58e..b5b4cb72a8a8 100644 --- a/drivers/acpi/acpica/nsutils.c +++ b/drivers/acpi/acpica/nsutils.c | |||
@@ -557,8 +557,11 @@ acpi_ns_externalize_name(u32 internal_name_length, | |||
557 | (*converted_name)[j++] = '.'; | 557 | (*converted_name)[j++] = '.'; |
558 | } | 558 | } |
559 | 559 | ||
560 | ACPI_MOVE_NAME(*converted_name, internal_name); | 560 | /* Copy and validate the 4-char name segment */ |
561 | acpi_ut_repair_name(*converted_name); | 561 | |
562 | ACPI_MOVE_NAME(&(*converted_name)[j], | ||
563 | &internal_name[names_index]); | ||
564 | acpi_ut_repair_name(&(*converted_name)[j]); | ||
562 | 565 | ||
563 | j += ACPI_NAME_SIZE; | 566 | j += ACPI_NAME_SIZE; |
564 | names_index += ACPI_NAME_SIZE; | 567 | names_index += ACPI_NAME_SIZE; |