Commit 896bece7 authored by Bob Moore's avatar Bob Moore Committed by Rafael J. Wysocki

ACPICA: Fix a regression in the acpi_evaluate_object_type() interface

ACPICA commit 9ab548ef154b992208524d61770caca90a9762be

The optional Pathname parameter inadvertently became required.
Introduced in April 2017.

Link: https://github.com/acpica/acpica/commit/9ab548efSigned-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarErik Schmauss <erik.schmauss@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 6be2d72b
...@@ -61,10 +61,10 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info); ...@@ -61,10 +61,10 @@ static void acpi_ns_resolve_references(struct acpi_evaluate_info *info);
* *
* PARAMETERS: handle - Object handle (optional) * PARAMETERS: handle - Object handle (optional)
* pathname - Object pathname (optional) * pathname - Object pathname (optional)
* external_params - List of parameters to pass to method, * external_params - List of parameters to pass to a method,
* terminated by NULL. May be NULL * terminated by NULL. May be NULL
* if no parameters are being passed. * if no parameters are being passed.
* return_buffer - Where to put method's return value (if * return_buffer - Where to put the object's return value (if
* any). If NULL, no value is returned. * any). If NULL, no value is returned.
* return_type - Expected type of return object * return_type - Expected type of return object
* *
...@@ -100,13 +100,14 @@ acpi_evaluate_object_typed(acpi_handle handle, ...@@ -100,13 +100,14 @@ acpi_evaluate_object_typed(acpi_handle handle,
free_buffer_on_error = TRUE; free_buffer_on_error = TRUE;
} }
/* Get a handle here, in order to build an error message if needed */
target_handle = handle;
if (pathname) { if (pathname) {
status = acpi_get_handle(handle, pathname, &target_handle); status = acpi_get_handle(handle, pathname, &target_handle);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }
} else {
target_handle = handle;
} }
full_pathname = acpi_ns_get_external_pathname(target_handle); full_pathname = acpi_ns_get_external_pathname(target_handle);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment