git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
acpi
/
utilities
/
utcopy.c
diff --git
a/drivers/acpi/utilities/utcopy.c
b/drivers/acpi/utilities/utcopy.c
index
df2d320
..
5e1a80d
100644
(file)
--- a/
drivers/acpi/utilities/utcopy.c
+++ b/
drivers/acpi/utilities/utcopy.c
@@
-109,7
+109,7
@@
acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
{
acpi_status status = AE_OK;
{
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE(
"ut_copy_isimple_to_esimple"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_isimple_to_esimple
);
*buffer_space_used = 0;
*buffer_space_used = 0;
@@
-325,7
+325,7
@@
acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
acpi_status status;
struct acpi_pkg_info info;
acpi_status status;
struct acpi_pkg_info info;
- ACPI_FUNCTION_TRACE(
"ut_copy_ipackage_to_epackage"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_ipackage_to_epackage
);
/*
* First package at head of the buffer
/*
* First package at head of the buffer
@@
-383,7
+383,7
@@
acpi_ut_copy_iobject_to_eobject(union acpi_operand_object *internal_object,
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ut_copy_iobject_to_eobject"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_iobject_to_eobject
);
if (ACPI_GET_OBJECT_TYPE(internal_object) == ACPI_TYPE_PACKAGE) {
/*
if (ACPI_GET_OBJECT_TYPE(internal_object) == ACPI_TYPE_PACKAGE) {
/*
@@
-442,7
+442,7
@@
acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
{
union acpi_operand_object *internal_object;
{
union acpi_operand_object *internal_object;
- ACPI_FUNCTION_TRACE(
"ut_copy_esimple_to_isimple"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_esimple_to_isimple
);
/*
* Simple types supported are: String, Buffer, Integer
/*
* Simple types supported are: String, Buffer, Integer
@@
-472,8
+472,8
@@
acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
case ACPI_TYPE_STRING:
internal_object->string.pointer =
case ACPI_TYPE_STRING:
internal_object->string.pointer =
- ACPI_
MEM_CALLOCATE
((acpi_size) external_object->string.
- length + 1);
+ ACPI_
ALLOCATE_ZEROED
((acpi_size) external_object->string.
+
length + 1);
if (!internal_object->string.pointer) {
goto error_exit;
}
if (!internal_object->string.pointer) {
goto error_exit;
}
@@
-488,7
+488,7
@@
acpi_ut_copy_esimple_to_isimple(union acpi_object *external_object,
case ACPI_TYPE_BUFFER:
internal_object->buffer.pointer =
case ACPI_TYPE_BUFFER:
internal_object->buffer.pointer =
- ACPI_
MEM_CALLOCATE
(external_object->buffer.length);
+ ACPI_
ALLOCATE_ZEROED
(external_object->buffer.length);
if (!internal_object->buffer.pointer) {
goto error_exit;
}
if (!internal_object->buffer.pointer) {
goto error_exit;
}
@@
-552,7
+552,7
@@
acpi_ut_copy_epackage_to_ipackage(union acpi_operand_object *internal_object,
union acpi_operand_object *this_internal_obj;
union acpi_object *this_external_obj;
union acpi_operand_object *this_internal_obj;
union acpi_object *this_external_obj;
- ACPI_FUNCTION_TRACE(
"ut_copy_epackage_to_ipackage"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_epackage_to_ipackage
);
/*
* First package at head of the buffer
/*
* First package at head of the buffer
@@
-600,7
+600,7
@@
acpi_ut_copy_eobject_to_iobject(union acpi_object *external_object,
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ut_copy_eobject_to_iobject"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_eobject_to_iobject
);
if (external_object->type == ACPI_TYPE_PACKAGE) {
/*
if (external_object->type == ACPI_TYPE_PACKAGE) {
/*
@@
-676,7
+676,7
@@
acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
if ((source_desc->buffer.pointer) &&
(source_desc->buffer.length)) {
dest_desc->buffer.pointer =
if ((source_desc->buffer.pointer) &&
(source_desc->buffer.length)) {
dest_desc->buffer.pointer =
- ACPI_
MEM_
ALLOCATE(source_desc->buffer.length);
+ ACPI_ALLOCATE(source_desc->buffer.length);
if (!dest_desc->buffer.pointer) {
return (AE_NO_MEMORY);
}
if (!dest_desc->buffer.pointer) {
return (AE_NO_MEMORY);
}
@@
-697,8
+697,8
@@
acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
*/
if (source_desc->string.pointer) {
dest_desc->string.pointer =
*/
if (source_desc->string.pointer) {
dest_desc->string.pointer =
- ACPI_
MEM_
ALLOCATE((acpi_size) source_desc->string.
-
length + 1);
+ ACPI_ALLOCATE((acpi_size) source_desc->string.
+ length + 1);
if (!dest_desc->string.pointer) {
return (AE_NO_MEMORY);
}
if (!dest_desc->string.pointer) {
return (AE_NO_MEMORY);
}
@@
-805,9
+805,7
@@
acpi_ut_copy_ielement_to_ielement(u8 object_type,
/*
* Create the object array
*/
/*
* Create the object array
*/
- target_object->package.elements =
- ACPI_MEM_CALLOCATE(((acpi_size) source_object->package.
- count + 1) * sizeof(void *));
+ target_object->package.elements = ACPI_ALLOCATE_ZEROED(((acpi_size) source_object->package.count + 1) * sizeof(void *));
if (!target_object->package.elements) {
status = AE_NO_MEMORY;
goto error_exit;
if (!target_object->package.elements) {
status = AE_NO_MEMORY;
goto error_exit;
@@
-856,7
+854,7
@@
acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
{
acpi_status status = AE_OK;
{
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE(
"ut_copy_ipackage_to_ipackage"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_ipackage_to_ipackage
);
dest_obj->common.type = ACPI_GET_OBJECT_TYPE(source_obj);
dest_obj->common.flags = source_obj->common.flags;
dest_obj->common.type = ACPI_GET_OBJECT_TYPE(source_obj);
dest_obj->common.flags = source_obj->common.flags;
@@
-865,10
+863,10
@@
acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
/*
* Create the object array and walk the source package tree
*/
/*
* Create the object array and walk the source package tree
*/
- dest_obj->package.elements = ACPI_
MEM_CALLOCATE
(((acpi_size)
- source_obj->package.
- count +
- 1) * sizeof(void *));
+ dest_obj->package.elements = ACPI_
ALLOCATE_ZEROED
(((acpi_size)
+
source_obj->package.
+
count +
+
1) * sizeof(void *));
if (!dest_obj->package.elements) {
ACPI_ERROR((AE_INFO, "Package allocation failure"));
return_ACPI_STATUS(AE_NO_MEMORY);
if (!dest_obj->package.elements) {
ACPI_ERROR((AE_INFO, "Package allocation failure"));
return_ACPI_STATUS(AE_NO_MEMORY);
@@
-882,6
+880,7
@@
acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
acpi_ut_copy_ielement_to_ielement,
walk_state);
if (ACPI_FAILURE(status)) {
acpi_ut_copy_ielement_to_ielement,
walk_state);
if (ACPI_FAILURE(status)) {
+
/* On failure, delete the destination package object */
acpi_ut_remove_reference(dest_obj);
/* On failure, delete the destination package object */
acpi_ut_remove_reference(dest_obj);
@@
-911,7
+910,7
@@
acpi_ut_copy_iobject_to_iobject(union acpi_operand_object *source_desc,
{
acpi_status status = AE_OK;
{
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE(
"ut_copy_iobject_to_iobject"
);
+ ACPI_FUNCTION_TRACE(
ut_copy_iobject_to_iobject
);
/* Create the top level object */
/* Create the top level object */