5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index d72df66aa965..da88834f55e7 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -205,7 +205,7 @@ acpi_ns_dump_one_object(acpi_handle obj_handle,
 
                 if (!acpi_ut_valid_acpi_name(this_node->name.integer)) {
                         this_node->name.integer =
-                            acpi_ut_repair_name(this_node->name.integer);
+                            acpi_ut_repair_name(this_node->name.ascii);
 
                         ACPI_WARNING((AE_INFO, "Invalid ACPI Name %08X",
                                       this_node->name.integer));
diff --git a/drivers/acpi/namespace/nssearch.c b/drivers/acpi/namespace/nssearch.c
index 500e2bbcfaf7..566f0a4aff93 100644
--- a/drivers/acpi/namespace/nssearch.c
+++ b/drivers/acpi/namespace/nssearch.c
@@ -321,7 +321,8 @@ acpi_ns_search_and_enter(u32 target_name,
          * even though there are a few bad names.
          */
         if (!acpi_ut_valid_acpi_name(target_name)) {
-                target_name = acpi_ut_repair_name(target_name);
+                target_name =
+                    acpi_ut_repair_name(ACPI_CAST_PTR(char, &target_name));
 
                 /* Report warning only if in strict mode or debug mode */
 
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c
index a524e75b7ae4..855bc8fea3a4 100644
--- a/drivers/acpi/utilities/utglobal.c
+++ b/drivers/acpi/utilities/utglobal.c
@@ -566,7 +566,7 @@ char *acpi_ut_get_node_name(void *object)
         /* Name must be a valid ACPI name */
 
         if (!acpi_ut_valid_acpi_name(node->name.integer)) {
-                node->name.integer = acpi_ut_repair_name(node->name.integer);
+                node->name.integer = acpi_ut_repair_name(node->name.ascii);
         }
 
         /* Return the name */
diff --git a/drivers/acpi/utilities/utmisc.c b/drivers/acpi/utilities/utmisc.c
index 4b0305174d25..36d88158f9f4 100644
--- a/drivers/acpi/utilities/utmisc.c
+++ b/drivers/acpi/utilities/utmisc.c
@@ -582,26 +582,25 @@ u8 acpi_ut_valid_acpi_name(u32 name)
  *
  ******************************************************************************/
 
-acpi_name acpi_ut_repair_name(acpi_name name)
+acpi_name acpi_ut_repair_name(char *name)
 {
-        char *name_ptr = ACPI_CAST_PTR(char, &name);
-        char new_name[ACPI_NAME_SIZE];
         acpi_native_uint i;
+        char new_name[ACPI_NAME_SIZE];
 
         for (i = 0; i < ACPI_NAME_SIZE; i++) {
-                new_name[i] = name_ptr[i];
+                new_name[i] = name[i];
 
                 /*
                  * Replace a bad character with something printable, yet technically
                  * still invalid. This prevents any collisions with existing "good"
                  * names in the namespace.
                  */
-                if (!acpi_ut_valid_acpi_char(name_ptr[i], i)) {
+                if (!acpi_ut_valid_acpi_char(name[i], i)) {
                         new_name[i] = '*';
                 }
         }
 
-        return (*ACPI_CAST_PTR(u32, new_name));
+        return (*(u32 *) new_name);
 }
 
 /*******************************************************************************
diff --git a/include/acpi/acutils.h b/include/acpi/acutils.h
index ba039ea1a057..beb07ac83b8a 100644
--- a/include/acpi/acutils.h
+++ b/include/acpi/acutils.h
@@ -470,7 +470,7 @@ void acpi_ut_print_string(char *string, u8 max_length);
 
 u8 acpi_ut_valid_acpi_name(u32 name);
 
-acpi_name acpi_ut_repair_name(acpi_name name);
+acpi_name acpi_ut_repair_name(char *name);
 
 u8 acpi_ut_valid_acpi_char(char character, acpi_native_uint position);