1 files changed, 42 insertions, 6 deletions

diff --git a/drivers/acpi/acpica/exoparg1.c b/drivers/acpi/acpica/exoparg1.c
index 814b4a3d656a..2cdd41d8ade6 100644
--- a/drivers/acpi/acpica/exoparg1.c
+++ b/drivers/acpi/acpica/exoparg1.c
@@ -962,10 +962,17 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                          */
                                         return_desc =
                                             *(operand[0]->reference.where);
-                                        if (return_desc) {
-                                                acpi_ut_add_reference
-                                                    (return_desc);
+                                        if (!return_desc) {
+                                                /*
+                                                 * Element is NULL, do not allow the dereference.
+                                                 * This provides compatibility with other ACPI
+                                                 * implementations.
+                                                 */
+                                                return_ACPI_STATUS
+                                                    (AE_AML_UNINITIALIZED_ELEMENT);
                                         }
+
+                                        acpi_ut_add_reference(return_desc);
                                         break;
 
                                 default:
@@ -990,11 +997,40 @@ acpi_status acpi_ex_opcode_1A_0T_1R(struct acpi_walk_state *walk_state)
                                                                          acpi_namespace_node
                                                                          *)
                                                                         return_desc);
-                                }
+                                        if (!return_desc) {
+                                                break;
+                                        }
 
-                                /* Add another reference to the object! */
+                                        /*
+                                         * June 2013:
+                                         * buffer_fields/field_units require additional resolution
+                                         */
+                                        switch (return_desc->common.type) {
+                                        case ACPI_TYPE_BUFFER_FIELD:
+                                        case ACPI_TYPE_LOCAL_REGION_FIELD:
+                                        case ACPI_TYPE_LOCAL_BANK_FIELD:
+                                        case ACPI_TYPE_LOCAL_INDEX_FIELD:
 
-                                acpi_ut_add_reference(return_desc);
+                                                status =
+                                                    acpi_ex_read_data_from_field
+                                                    (walk_state, return_desc,
+                                                     &temp_desc);
+                                                if (ACPI_FAILURE(status)) {
+                                                        goto cleanup;
+                                                }
+
+                                                return_desc = temp_desc;
+                                                break;
+
+                                        default:
+
+                                                /* Add another reference to the object */
+
+                                                acpi_ut_add_reference
+                                                    (return_desc);
+                                                break;
+                                        }
+                                }
                                 break;
 
                         default: