revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / acpi / acpica / dswexec.c

diff --git a/drivers/acpi/acpica/dswexec.c b/drivers/acpi/acpica/dswexec.c
index 6b0b5d08d97acf12d35016c96ce0eaaaa0126627..d555b374e314a881b463083c890563a658257f4d 100644 (file)
--- a/drivers/acpi/acpica/dswexec.c
+++ b/drivers/acpi/acpica/dswexec.c
@@ -300,25 +300,10 @@ acpi_ds_exec_begin_op(struct acpi_walk_state *walk_state,
                         * we must enter this object into the namespace.  The created
                         * object is temporary and will be deleted upon completion of
                         * the execution of this method.
-                        *
-                        * Note 10/2010: Except for the Scope() op. This opcode does
-                        * not actually create a new object, it refers to an existing
-                        * object. However, for Scope(), we want to indeed open a
-                        * new scope.
                         */
-                       if (op->common.aml_opcode != AML_SCOPE_OP) {
-                               status =
-                                   acpi_ds_load2_begin_op(walk_state, NULL);
-                       } else {
-                               status =
-                                   acpi_ds_scope_stack_push(op->named.node,
-                                                            op->named.node->
-                                                            type, walk_state);
-                               if (ACPI_FAILURE(status)) {
-                                       return_ACPI_STATUS(status);
-                               }
-                       }
+                       status = acpi_ds_load2_begin_op(walk_state, NULL);
                }
+
                break;
 
        case AML_CLASS_EXECUTE: