|
@@ -259,34 +259,26 @@ acpi_evaluate_integer(acpi_handle handle,
|
|
|
struct acpi_object_list *arguments, unsigned long long *data)
|
|
|
{
|
|
|
acpi_status status = AE_OK;
|
|
|
- union acpi_object *element;
|
|
|
+ union acpi_object element;
|
|
|
struct acpi_buffer buffer = { 0, NULL };
|
|
|
|
|
|
-
|
|
|
if (!data)
|
|
|
return AE_BAD_PARAMETER;
|
|
|
|
|
|
- element = kzalloc(sizeof(union acpi_object), irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL);
|
|
|
- if (!element)
|
|
|
- return AE_NO_MEMORY;
|
|
|
-
|
|
|
buffer.length = sizeof(union acpi_object);
|
|
|
- buffer.pointer = element;
|
|
|
+ buffer.pointer = &element;
|
|
|
status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
|
|
|
if (ACPI_FAILURE(status)) {
|
|
|
acpi_util_eval_error(handle, pathname, status);
|
|
|
- kfree(element);
|
|
|
return status;
|
|
|
}
|
|
|
|
|
|
- if (element->type != ACPI_TYPE_INTEGER) {
|
|
|
+ if (element.type != ACPI_TYPE_INTEGER) {
|
|
|
acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
|
|
|
- kfree(element);
|
|
|
return AE_BAD_DATA;
|
|
|
}
|
|
|
|
|
|
- *data = element->integer.value;
|
|
|
- kfree(element);
|
|
|
+ *data = element.integer.value;
|
|
|
|
|
|
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%llu]\n", *data));
|
|
|
|