git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
utmisc.c
diff --git
a/drivers/acpi/acpica/utmisc.c
b/drivers/acpi/acpica/utmisc.c
index
c1f7f4e
..
1c9e250
100644
(file)
--- a/
drivers/acpi/acpica/utmisc.c
+++ b/
drivers/acpi/acpica/utmisc.c
@@
-938,8
+938,7
@@
acpi_ut_walk_package_tree(union acpi_operand_object * source_object,
if ((!this_source_obj) ||
(ACPI_GET_DESCRIPTOR_TYPE(this_source_obj) !=
ACPI_DESC_TYPE_OPERAND)
if ((!this_source_obj) ||
(ACPI_GET_DESCRIPTOR_TYPE(this_source_obj) !=
ACPI_DESC_TYPE_OPERAND)
- || (ACPI_GET_OBJECT_TYPE(this_source_obj) !=
- ACPI_TYPE_PACKAGE)) {
+ || (this_source_obj->common.type != ACPI_TYPE_PACKAGE)) {
status =
walk_callback(ACPI_COPY_TYPE_SIMPLE,
this_source_obj, state, context);
status =
walk_callback(ACPI_COPY_TYPE_SIMPLE,
this_source_obj, state, context);