Merge branch 'topic/pcm-estrpipe-in-pm' into for-linus

[pandora-kernel.git] / drivers / acpi / acpica / dsutils.c

diff --git a/drivers/acpi/acpica/dsutils.c b/drivers/acpi/acpica/dsutils.c
index dabc23a..dfa1041 100644 (file)
--- a/drivers/acpi/acpica/dsutils.c
+++ b/drivers/acpi/acpica/dsutils.c
@@ -816,7 +816,7 @@ acpi_status acpi_ds_evaluate_name_path(struct acpi_walk_state *walk_state)
                goto push_result;
        }
 
-       type = ACPI_GET_OBJECT_TYPE(*operand);
+       type = (*operand)->common.type;
 
        status = acpi_ex_resolve_to_value(operand, walk_state);
        if (ACPI_FAILURE(status)) {