Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...

[powerpc.git] / drivers / acpi / executer / exresop.c

diff --git a/drivers/acpi/executer/exresop.c b/drivers/acpi/executer/exresop.c
index 4c93d09..09d897b 100644 (file)
--- a/drivers/acpi/executer/exresop.c
+++ b/drivers/acpi/executer/exresop.c
@@ -6,7 +6,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -354,8 +354,7 @@ acpi_ex_resolve_operands(u16 opcode,
                        if ((opcode == AML_STORE_OP) &&
                            (ACPI_GET_OBJECT_TYPE(*stack_ptr) ==
                             ACPI_TYPE_LOCAL_REFERENCE)
-                           && ((*stack_ptr)->reference.opcode ==
-                               AML_INDEX_OP)) {
+                           && ((*stack_ptr)->reference.opcode == AML_INDEX_OP)) {
                                goto next_operand;
                        }
                        break;
@@ -611,22 +610,20 @@ acpi_ex_resolve_operands(u16 opcode,
                        }
                        goto next_operand;
 
-               case ARGI_REGION_OR_FIELD:
+               case ARGI_REGION_OR_BUFFER:     /* Used by Load() only */
 
-                       /* Need an operand of type REGION or a FIELD in a region */
+                       /* Need an operand of type REGION or a BUFFER (which could be a resolved region field) */
 
                        switch (ACPI_GET_OBJECT_TYPE(obj_desc)) {
+                       case ACPI_TYPE_BUFFER:
                        case ACPI_TYPE_REGION:
-                       case ACPI_TYPE_LOCAL_REGION_FIELD:
-                       case ACPI_TYPE_LOCAL_BANK_FIELD:
-                       case ACPI_TYPE_LOCAL_INDEX_FIELD:
 
                                /* Valid operand */
                                break;
 
                        default:
                                ACPI_ERROR((AE_INFO,
-                                           "Needed [Region/RegionField], found [%s] %p",
+                                           "Needed [Region/Buffer], found [%s] %p",
                                            acpi_ut_get_object_type_name
                                            (obj_desc), obj_desc));