adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

ACPI: fix OSC regression that caused aer and pciehp not to load

Browse source 
Executing _OSC returns a buffer, which has an acpi object in it.
Don't directly returns the buffer, instead, we return the acpi object's
buffer. This fixes a regression since caller of acpi_run_osc expects
an acpi object's buffer returned.

Tested-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Shaohua Li 2009-12-23 17:04:11 +08:00 committed by Len Brown
parent 3563ff964f
commit 9dc130fccb
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/acpi/bus.c
View file

@ -397,6 +397,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
union acpi_object *out_obj; union acpi_object *out_obj;
u8 uuid[16]; u8 uuid[16];
u32 errors; u32 errors;
struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
if (!context) if (!context)
return AE_ERROR; return AE_ERROR;
@ -419,16 +420,16 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
in_params[3].buffer.length = context->cap.length; in_params[3].buffer.length = context->cap.length;
in_params[3].buffer.pointer = context->cap.pointer; in_params[3].buffer.pointer = context->cap.pointer;
status = acpi_evaluate_object(handle, "_OSC", &input, &context->ret); status = acpi_evaluate_object(handle, "_OSC", &input, &output);
if (ACPI_FAILURE(status)) if (ACPI_FAILURE(status))
return status; return status;
/* return buffer should have the same length as cap buffer */ if (!output.length)
if (context->ret.length != context->cap.length)
return AE_NULL_OBJECT; return AE_NULL_OBJECT;
out_obj = context->ret.pointer; out_obj = output.pointer;
if (out_obj->type != ACPI_TYPE_BUFFER) { if (out_obj->type != ACPI_TYPE_BUFFER
|| out_obj->buffer.length != context->cap.length) {
acpi_print_osc_error(handle, context, acpi_print_osc_error(handle, context,
"_OSC evaluation returned wrong type"); "_OSC evaluation returned wrong type");
status = AE_TYPE; status = AE_TYPE;
@ -457,11 +458,20 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
goto out_kfree; goto out_kfree;
} }
out_success: out_success:
return AE_OK; context->ret.length = out_obj->buffer.length;
context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL);
if (!context->ret.pointer) {
status = AE_NO_MEMORY;
goto out_kfree;
}
memcpy(context->ret.pointer, out_obj->buffer.pointer,
context->ret.length);
status = AE_OK;
out_kfree: out_kfree:
kfree(context->ret.pointer); kfree(output.pointer);
context->ret.pointer = NULL; if (status != AE_OK)
context->ret.pointer = NULL;
return status; return status;
} }
EXPORT_SYMBOL(acpi_run_osc); EXPORT_SYMBOL(acpi_run_osc);