diff options
Diffstat (limited to 'drivers/acpi/namespace/nsaccess.c')
-rw-r--r-- | drivers/acpi/namespace/nsaccess.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c index 1149bc18fb35..6bdad8bfcf0b 100644 --- a/drivers/acpi/namespace/nsaccess.c +++ b/drivers/acpi/namespace/nsaccess.c | |||
@@ -98,6 +98,7 @@ acpi_status acpi_ns_root_initialize(void) | |||
98 | "Entering predefined entries into namespace\n")); | 98 | "Entering predefined entries into namespace\n")); |
99 | 99 | ||
100 | for (init_val = acpi_gbl_pre_defined_names; init_val->name; init_val++) { | 100 | for (init_val = acpi_gbl_pre_defined_names; init_val->name; init_val++) { |
101 | |||
101 | /* _OSI is optional for now, will be permanent later */ | 102 | /* _OSI is optional for now, will be permanent later */ |
102 | 103 | ||
103 | if (!ACPI_STRCMP(init_val->name, "_OSI") | 104 | if (!ACPI_STRCMP(init_val->name, "_OSI") |
@@ -365,6 +366,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
365 | * Begin examination of the actual pathname | 366 | * Begin examination of the actual pathname |
366 | */ | 367 | */ |
367 | if (!pathname) { | 368 | if (!pathname) { |
369 | |||
368 | /* A Null name_path is allowed and refers to the root */ | 370 | /* A Null name_path is allowed and refers to the root */ |
369 | 371 | ||
370 | num_segments = 0; | 372 | num_segments = 0; |
@@ -389,6 +391,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
389 | * to the current scope). | 391 | * to the current scope). |
390 | */ | 392 | */ |
391 | if (*path == (u8) AML_ROOT_PREFIX) { | 393 | if (*path == (u8) AML_ROOT_PREFIX) { |
394 | |||
392 | /* Pathname is fully qualified, start from the root */ | 395 | /* Pathname is fully qualified, start from the root */ |
393 | 396 | ||
394 | this_node = acpi_gbl_root_node; | 397 | this_node = acpi_gbl_root_node; |
@@ -416,6 +419,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
416 | this_node = prefix_node; | 419 | this_node = prefix_node; |
417 | num_carats = 0; | 420 | num_carats = 0; |
418 | while (*path == (u8) AML_PARENT_PREFIX) { | 421 | while (*path == (u8) AML_PARENT_PREFIX) { |
422 | |||
419 | /* Name is fully qualified, no search rules apply */ | 423 | /* Name is fully qualified, no search rules apply */ |
420 | 424 | ||
421 | search_parent_flag = ACPI_NS_NO_UPSEARCH; | 425 | search_parent_flag = ACPI_NS_NO_UPSEARCH; |
@@ -430,6 +434,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
430 | num_carats++; | 434 | num_carats++; |
431 | this_node = acpi_ns_get_parent_node(this_node); | 435 | this_node = acpi_ns_get_parent_node(this_node); |
432 | if (!this_node) { | 436 | if (!this_node) { |
437 | |||
433 | /* Current scope has no parent scope */ | 438 | /* Current scope has no parent scope */ |
434 | 439 | ||
435 | ACPI_ERROR((AE_INFO, | 440 | ACPI_ERROR((AE_INFO, |
@@ -569,6 +574,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
569 | &this_node); | 574 | &this_node); |
570 | if (ACPI_FAILURE(status)) { | 575 | if (ACPI_FAILURE(status)) { |
571 | if (status == AE_NOT_FOUND) { | 576 | if (status == AE_NOT_FOUND) { |
577 | |||
572 | /* Name not found in ACPI namespace */ | 578 | /* Name not found in ACPI namespace */ |
573 | 579 | ||
574 | ACPI_DEBUG_PRINT((ACPI_DB_NAMES, | 580 | ACPI_DEBUG_PRINT((ACPI_DB_NAMES, |
@@ -602,6 +608,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
602 | (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) && | 608 | (type_to_check_for != ACPI_TYPE_LOCAL_SCOPE) && |
603 | (this_node->type != ACPI_TYPE_ANY) && | 609 | (this_node->type != ACPI_TYPE_ANY) && |
604 | (this_node->type != type_to_check_for)) { | 610 | (this_node->type != type_to_check_for)) { |
611 | |||
605 | /* Complain about a type mismatch */ | 612 | /* Complain about a type mismatch */ |
606 | 613 | ||
607 | ACPI_WARNING((AE_INFO, | 614 | ACPI_WARNING((AE_INFO, |