git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ARM fixes
[sfrench/cifs-2.6.git]
/
drivers
/
acpi
/
executer
/
exstoren.c
diff --git
a/drivers/acpi/executer/exstoren.c
b/drivers/acpi/executer/exstoren.c
index 42967baf760de53ba7a5214739910e2a460dc74b..1d622c625c6406bc91a7e7b0f7542e4be107f955 100644
(file)
--- a/
drivers/acpi/executer/exstoren.c
+++ b/
drivers/acpi/executer/exstoren.c
@@
-7,7
+7,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
6
, R. Byron Moore
+ * Copyright (C) 2000 - 200
7
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-72,7
+72,7
@@
acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
union acpi_operand_object *source_desc = *source_desc_ptr;
acpi_status status = AE_OK;
union acpi_operand_object *source_desc = *source_desc_ptr;
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE(
"ex_resolve_object"
);
+ ACPI_FUNCTION_TRACE(
ex_resolve_object
);
/* Ensure we have a Target that can be stored to */
/* Ensure we have a Target that can be stored to */
@@
-97,6
+97,7
@@
acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
*/
if (ACPI_GET_OBJECT_TYPE(source_desc) ==
ACPI_TYPE_LOCAL_REFERENCE) {
*/
if (ACPI_GET_OBJECT_TYPE(source_desc) ==
ACPI_TYPE_LOCAL_REFERENCE) {
+
/* Resolve a reference object first */
status =
/* Resolve a reference object first */
status =
@@
-121,6
+122,7
@@
acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
!((ACPI_GET_OBJECT_TYPE(source_desc) ==
ACPI_TYPE_LOCAL_REFERENCE)
&& (source_desc->reference.opcode == AML_LOAD_OP))) {
!((ACPI_GET_OBJECT_TYPE(source_desc) ==
ACPI_TYPE_LOCAL_REFERENCE)
&& (source_desc->reference.opcode == AML_LOAD_OP))) {
+
/* Conversion successful but still not a valid type */
ACPI_ERROR((AE_INFO,
/* Conversion successful but still not a valid type */
ACPI_ERROR((AE_INFO,
@@
-199,7
+201,7
@@
acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
union acpi_operand_object *actual_src_desc;
acpi_status status = AE_OK;
union acpi_operand_object *actual_src_desc;
acpi_status status = AE_OK;
- ACPI_FUNCTION_TRACE_PTR(
"ex_store_object_to_object"
, source_desc);
+ ACPI_FUNCTION_TRACE_PTR(
ex_store_object_to_object
, source_desc);
actual_src_desc = source_desc;
if (!dest_desc) {
actual_src_desc = source_desc;
if (!dest_desc) {
@@
-289,6
+291,7
@@
acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
}
if (actual_src_desc != source_desc) {
}
if (actual_src_desc != source_desc) {
+
/* Delete the intermediate (temporary) source object */
acpi_ut_remove_reference(actual_src_desc);
/* Delete the intermediate (temporary) source object */
acpi_ut_remove_reference(actual_src_desc);