diff options
Diffstat (limited to 'drivers/acpi/utilities/utglobal.c')
-rw-r--r-- | drivers/acpi/utilities/utglobal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c index 413e1dd8ae36..d6813d88a104 100644 --- a/drivers/acpi/utilities/utglobal.c +++ b/drivers/acpi/utilities/utglobal.c | |||
@@ -638,7 +638,7 @@ char *acpi_ut_get_node_name(void *object) | |||
638 | 638 | ||
639 | /* Name must be a valid ACPI name */ | 639 | /* Name must be a valid ACPI name */ |
640 | 640 | ||
641 | if (!acpi_ut_valid_acpi_name(*(u32 *) node->name.ascii)) { | 641 | if (!acpi_ut_valid_acpi_name(node->name.integer)) { |
642 | return ("????"); | 642 | return ("????"); |
643 | } | 643 | } |
644 | 644 | ||
@@ -831,6 +831,7 @@ void acpi_ut_init_globals(void) | |||
831 | acpi_gbl_ps_find_count = 0; | 831 | acpi_gbl_ps_find_count = 0; |
832 | acpi_gbl_acpi_hardware_present = TRUE; | 832 | acpi_gbl_acpi_hardware_present = TRUE; |
833 | acpi_gbl_owner_id_mask = 0; | 833 | acpi_gbl_owner_id_mask = 0; |
834 | acpi_gbl_last_owner_id = 0; | ||
834 | acpi_gbl_trace_method_name = 0; | 835 | acpi_gbl_trace_method_name = 0; |
835 | acpi_gbl_trace_dbg_level = 0; | 836 | acpi_gbl_trace_dbg_level = 0; |
836 | acpi_gbl_trace_dbg_layer = 0; | 837 | acpi_gbl_trace_dbg_layer = 0; |
@@ -845,7 +846,6 @@ void acpi_ut_init_globals(void) | |||
845 | /* Namespace */ | 846 | /* Namespace */ |
846 | 847 | ||
847 | acpi_gbl_root_node = NULL; | 848 | acpi_gbl_root_node = NULL; |
848 | |||
849 | acpi_gbl_root_node_struct.name.integer = ACPI_ROOT_NAME; | 849 | acpi_gbl_root_node_struct.name.integer = ACPI_ROOT_NAME; |
850 | acpi_gbl_root_node_struct.descriptor = ACPI_DESC_TYPE_NAMED; | 850 | acpi_gbl_root_node_struct.descriptor = ACPI_DESC_TYPE_NAMED; |
851 | acpi_gbl_root_node_struct.type = ACPI_TYPE_DEVICE; | 851 | acpi_gbl_root_node_struct.type = ACPI_TYPE_DEVICE; |