1 files changed, 12 insertions, 8 deletions

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index 16219bde48da..f214dbfc4047 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -48,6 +48,7 @@
 #include "actables.h"
 #include "acdispat.h"
 #include "acevents.h"
+#include "amlcode.h"
 
 #define _COMPONENT          ACPI_EXECUTER
 ACPI_MODULE_NAME("exconfig")
@@ -120,8 +121,11 @@ acpi_ex_add_table(u32 table_index,
         acpi_ns_exec_module_code_list();
         acpi_ex_enter_interpreter();
 
-        /* Update GPEs for any new _Lxx/_Exx methods. Ignore errors */
-
+        /*
+         * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is
+         * responsible for discovering any new wake GPEs by running _PRW methods
+         * that may have been loaded by this table.
+         */
         status = acpi_tb_get_owner_id(table_index, &owner_id);
         if (ACPI_SUCCESS(status)) {
                 acpi_ev_update_gpes(owner_id);
@@ -158,12 +162,12 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
 
         ACPI_FUNCTION_TRACE(ex_load_table_op);
 
-        /* Validate lengths for the signature_string, OEMIDString, OEMtable_iD */
+        /* Validate lengths for the Signature, oem_id, and oem_table_id strings */
 
         if ((operand[0]->string.length > ACPI_NAME_SIZE) ||
             (operand[1]->string.length > ACPI_OEM_ID_SIZE) ||
             (operand[2]->string.length > ACPI_OEM_TABLE_ID_SIZE)) {
-                return_ACPI_STATUS(AE_BAD_PARAMETER);
+                return_ACPI_STATUS(AE_AML_STRING_LIMIT);
         }
 
         /* Find the ACPI table in the RSDT/XSDT */
@@ -210,8 +214,8 @@ acpi_ex_load_table_op(struct acpi_walk_state *walk_state,
         /* parameter_path (optional parameter) */
 
         if (operand[4]->string.length > 0) {
-                if ((operand[4]->string.pointer[0] != '\\') &&
-                    (operand[4]->string.pointer[0] != '^')) {
+                if ((operand[4]->string.pointer[0] != AML_ROOT_PREFIX) &&
+                    (operand[4]->string.pointer[0] != AML_PARENT_PREFIX)) {
                         /*
                          * Path is not absolute, so it will be relative to the node
                          * referenced by the root_path_string (or the NS root if omitted)
@@ -301,7 +305,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
                     acpi_ev_address_space_dispatch(obj_desc, NULL, ACPI_READ,
                                                    region_offset, 8, &value);
                 if (ACPI_FAILURE(status)) {
-                        return status;
+                        return (status);
                 }
 
                 *buffer = (u8)value;
@@ -309,7 +313,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
                 region_offset++;
         }
 
-        return AE_OK;
+        return (AE_OK);
 }
 
 /*******************************************************************************