aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/utilities
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2007-02-02 11:48:19 -0500
committerLen Brown <len.brown@intel.com>2007-02-02 21:14:23 -0500
commit3d81b236a82a26fa8bdef9096829675d81890dc9 (patch)
tree6953c1fa67f04f3af48d69abca4e53202d20df32 /drivers/acpi/utilities
parentc5a7156959e89b32260ad6072bbf5077bcdfbeee (diff)
ACPICA: Fix unalignment in acpi_ut_repair_name
Update interface to acpi_ut_repair_name() to avoid alignment issues on IA64 Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/utilities')
-rw-r--r--drivers/acpi/utilities/utglobal.c2
-rw-r--r--drivers/acpi/utilities/utmisc.c11
2 files changed, 6 insertions, 7 deletions
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)
566 /* Name must be a valid ACPI name */ 566 /* Name must be a valid ACPI name */
567 567
568 if (!acpi_ut_valid_acpi_name(node->name.integer)) { 568 if (!acpi_ut_valid_acpi_name(node->name.integer)) {
569 node->name.integer = acpi_ut_repair_name(node->name.integer); 569 node->name.integer = acpi_ut_repair_name(node->name.ascii);
570 } 570 }
571 571
572 /* Return the name */ 572 /* 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)
582 * 582 *
583 ******************************************************************************/ 583 ******************************************************************************/
584 584
585acpi_name acpi_ut_repair_name(acpi_name name) 585acpi_name acpi_ut_repair_name(char *name)
586{ 586{
587 char *name_ptr = ACPI_CAST_PTR(char, &name);
588 char new_name[ACPI_NAME_SIZE];
589 acpi_native_uint i; 587 acpi_native_uint i;
588 char new_name[ACPI_NAME_SIZE];
590 589
591 for (i = 0; i < ACPI_NAME_SIZE; i++) { 590 for (i = 0; i < ACPI_NAME_SIZE; i++) {
592 new_name[i] = name_ptr[i]; 591 new_name[i] = name[i];
593 592
594 /* 593 /*
595 * Replace a bad character with something printable, yet technically 594 * Replace a bad character with something printable, yet technically
596 * still invalid. This prevents any collisions with existing "good" 595 * still invalid. This prevents any collisions with existing "good"
597 * names in the namespace. 596 * names in the namespace.
598 */ 597 */
599 if (!acpi_ut_valid_acpi_char(name_ptr[i], i)) { 598 if (!acpi_ut_valid_acpi_char(name[i], i)) {
600 new_name[i] = '*'; 599 new_name[i] = '*';
601 } 600 }
602 } 601 }
603 602
604 return (*ACPI_CAST_PTR(u32, new_name)); 603 return (*(u32 *) new_name);
605} 604}
606 605
607/******************************************************************************* 606/*******************************************************************************