diff options
Diffstat (limited to 'drivers/acpi/namespace/nsaccess.c')
-rw-r--r-- | drivers/acpi/namespace/nsaccess.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/namespace/nsaccess.c b/drivers/acpi/namespace/nsaccess.c index 5e3f63a90fb4..ba8ad569188f 100644 --- a/drivers/acpi/namespace/nsaccess.c +++ b/drivers/acpi/namespace/nsaccess.c | |||
@@ -157,7 +157,7 @@ acpi_status acpi_ns_root_initialize(void) | |||
157 | 157 | ||
158 | #if defined (ACPI_ASL_COMPILER) | 158 | #if defined (ACPI_ASL_COMPILER) |
159 | 159 | ||
160 | /* save the parameter count for the i_aSL compiler */ | 160 | /* Save the parameter count for the i_aSL compiler */ |
161 | 161 | ||
162 | new_node->value = obj_desc->method.param_count; | 162 | new_node->value = obj_desc->method.param_count; |
163 | #else | 163 | #else |
@@ -311,8 +311,7 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
311 | acpi_object_type type_to_check_for; | 311 | acpi_object_type type_to_check_for; |
312 | acpi_object_type this_search_type; | 312 | acpi_object_type this_search_type; |
313 | u32 search_parent_flag = ACPI_NS_SEARCH_PARENT; | 313 | u32 search_parent_flag = ACPI_NS_SEARCH_PARENT; |
314 | u32 local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | | 314 | u32 local_flags; |
315 | ACPI_NS_SEARCH_PARENT); | ||
316 | 315 | ||
317 | ACPI_FUNCTION_TRACE(ns_lookup); | 316 | ACPI_FUNCTION_TRACE(ns_lookup); |
318 | 317 | ||
@@ -320,8 +319,9 @@ acpi_ns_lookup(union acpi_generic_state *scope_info, | |||
320 | return_ACPI_STATUS(AE_BAD_PARAMETER); | 319 | return_ACPI_STATUS(AE_BAD_PARAMETER); |
321 | } | 320 | } |
322 | 321 | ||
323 | acpi_gbl_ns_lookup_count++; | 322 | local_flags = flags & ~(ACPI_NS_ERROR_IF_FOUND | ACPI_NS_SEARCH_PARENT); |
324 | *return_node = ACPI_ENTRY_NOT_FOUND; | 323 | *return_node = ACPI_ENTRY_NOT_FOUND; |
324 | acpi_gbl_ns_lookup_count++; | ||
325 | 325 | ||
326 | if (!acpi_gbl_root_node) { | 326 | if (!acpi_gbl_root_node) { |
327 | return_ACPI_STATUS(AE_NO_NAMESPACE); | 327 | return_ACPI_STATUS(AE_NO_NAMESPACE); |