diff options
Diffstat (limited to 'drivers/acpi/namespace/nsinit.c')
-rw-r--r-- | drivers/acpi/namespace/nsinit.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/acpi/namespace/nsinit.c b/drivers/acpi/namespace/nsinit.c index 9f929e479fd8..9aa337c33887 100644 --- a/drivers/acpi/namespace/nsinit.c +++ b/drivers/acpi/namespace/nsinit.c | |||
@@ -366,6 +366,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle, | |||
366 | status = acpi_ns_search_node(*ACPI_CAST_PTR(u32, METHOD_NAME__INI), | 366 | status = acpi_ns_search_node(*ACPI_CAST_PTR(u32, METHOD_NAME__INI), |
367 | device_node, ACPI_TYPE_METHOD, &ini_node); | 367 | device_node, ACPI_TYPE_METHOD, &ini_node); |
368 | if (ACPI_FAILURE(status)) { | 368 | if (ACPI_FAILURE(status)) { |
369 | |||
369 | /* No _INI method found - move on to next device */ | 370 | /* No _INI method found - move on to next device */ |
370 | 371 | ||
371 | return_ACPI_STATUS(AE_OK); | 372 | return_ACPI_STATUS(AE_OK); |
@@ -386,6 +387,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle, | |||
386 | 387 | ||
387 | status = acpi_ut_execute_STA(pinfo.node, &flags); | 388 | status = acpi_ut_execute_STA(pinfo.node, &flags); |
388 | if (ACPI_FAILURE(status)) { | 389 | if (ACPI_FAILURE(status)) { |
390 | |||
389 | /* Ignore error and move on to next device */ | 391 | /* Ignore error and move on to next device */ |
390 | 392 | ||
391 | return_ACPI_STATUS(AE_OK); | 393 | return_ACPI_STATUS(AE_OK); |
@@ -396,6 +398,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle, | |||
396 | } | 398 | } |
397 | 399 | ||
398 | if (!(flags & ACPI_STA_DEVICE_PRESENT)) { | 400 | if (!(flags & ACPI_STA_DEVICE_PRESENT)) { |
401 | |||
399 | /* Don't look at children of a not present device */ | 402 | /* Don't look at children of a not present device */ |
400 | 403 | ||
401 | return_ACPI_STATUS(AE_CTRL_DEPTH); | 404 | return_ACPI_STATUS(AE_CTRL_DEPTH); |
@@ -412,6 +415,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle, | |||
412 | pinfo.node = ini_node; | 415 | pinfo.node = ini_node; |
413 | status = acpi_ns_evaluate_by_handle(&pinfo); | 416 | status = acpi_ns_evaluate_by_handle(&pinfo); |
414 | if (ACPI_FAILURE(status)) { | 417 | if (ACPI_FAILURE(status)) { |
418 | |||
415 | /* Ignore error and move on to next device */ | 419 | /* Ignore error and move on to next device */ |
416 | 420 | ||
417 | #ifdef ACPI_DEBUG_OUTPUT | 421 | #ifdef ACPI_DEBUG_OUTPUT |
@@ -435,6 +439,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle, | |||
435 | } | 439 | } |
436 | 440 | ||
437 | if (acpi_gbl_init_handler) { | 441 | if (acpi_gbl_init_handler) { |
442 | |||
438 | /* External initialization handler is present, call it */ | 443 | /* External initialization handler is present, call it */ |
439 | 444 | ||
440 | status = | 445 | status = |