dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'osc' into release

This commit is contained in:
Len Brown 2009-12-24 01:16:35 -05:00
parent 2f99f5c8f0 9dc130fccb
commit 6f5464ce15
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);