diff options
| -rw-r--r-- | drivers/acpi/acpica/nsxfeval.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/nsxfeval.c b/drivers/acpi/acpica/nsxfeval.c index 538c61677c10..783f4c838aee 100644 --- a/drivers/acpi/acpica/nsxfeval.c +++ b/drivers/acpi/acpica/nsxfeval.c | |||
| @@ -100,9 +100,13 @@ acpi_evaluate_object_typed(acpi_handle handle, | |||
| 100 | free_buffer_on_error = TRUE; | 100 | free_buffer_on_error = TRUE; |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | status = acpi_get_handle(handle, pathname, &target_handle); | 103 | if (pathname) { |
| 104 | if (ACPI_FAILURE(status)) { | 104 | status = acpi_get_handle(handle, pathname, &target_handle); |
| 105 | return_ACPI_STATUS(status); | 105 | if (ACPI_FAILURE(status)) { |
| 106 | return_ACPI_STATUS(status); | ||
| 107 | } | ||
| 108 | } else { | ||
| 109 | target_handle = handle; | ||
| 106 | } | 110 | } |
| 107 | 111 | ||
| 108 | full_pathname = acpi_ns_get_external_pathname(target_handle); | 112 | full_pathname = acpi_ns_get_external_pathname(target_handle); |
