diff options
Diffstat (limited to 'drivers/acpi/acpica/nseval.c')
| -rw-r--r-- | drivers/acpi/acpica/nseval.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/drivers/acpi/acpica/nseval.c b/drivers/acpi/acpica/nseval.c index 1538f3eb2a8f..b61db69d5675 100644 --- a/drivers/acpi/acpica/nseval.c +++ b/drivers/acpi/acpica/nseval.c | |||
| @@ -98,17 +98,21 @@ acpi_status acpi_ns_evaluate(struct acpi_evaluate_info * info) | |||
| 98 | info->return_object = NULL; | 98 | info->return_object = NULL; |
| 99 | info->param_count = 0; | 99 | info->param_count = 0; |
| 100 | 100 | ||
| 101 | /* | 101 | if (!info->resolved_node) { |
| 102 | * Get the actual namespace node for the target object. Handles these cases: | 102 | /* |
| 103 | * | 103 | * Get the actual namespace node for the target object if we need to. |
| 104 | * 1) Null node, Pathname (absolute path) | 104 | * Handles these cases: |
| 105 | * 2) Node, Pathname (path relative to Node) | 105 | * |
| 106 | * 3) Node, Null Pathname | 106 | * 1) Null node, Pathname (absolute path) |
| 107 | */ | 107 | * 2) Node, Pathname (path relative to Node) |
| 108 | status = acpi_ns_get_node(info->prefix_node, info->pathname, | 108 | * 3) Node, Null Pathname |
| 109 | ACPI_NS_NO_UPSEARCH, &info->resolved_node); | 109 | */ |
| 110 | if (ACPI_FAILURE(status)) { | 110 | status = acpi_ns_get_node(info->prefix_node, info->pathname, |
| 111 | return_ACPI_STATUS(status); | 111 | ACPI_NS_NO_UPSEARCH, |
| 112 | &info->resolved_node); | ||
| 113 | if (ACPI_FAILURE(status)) { | ||
| 114 | return_ACPI_STATUS(status); | ||
| 115 | } | ||
| 112 | } | 116 | } |
| 113 | 117 | ||
| 114 | /* | 118 | /* |