forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/drivers/acpi/acpica/tbdata.c
....@@ -3,7 +3,7 @@
33 *
44 * Module Name: tbdata - Table manager data structure functions
55 *
6
- * Copyright (C) 2000 - 2018, Intel Corp.
6
+ * Copyright (C) 2000 - 2020, Intel Corp.
77 *
88 *****************************************************************************/
99
....@@ -480,7 +480,8 @@
480480
481481 /* If a particular signature is expected (DSDT/FACS), it must match */
482482
483
- if (signature && !ACPI_COMPARE_NAME(&table_desc->signature, signature)) {
483
+ if (signature &&
484
+ !ACPI_COMPARE_NAMESEG(&table_desc->signature, signature)) {
484485 ACPI_BIOS_ERROR((AE_INFO,
485486 "Invalid signature 0x%X for ACPI table, expected [%s]",
486487 table_desc->signature.integer, signature));
....@@ -749,6 +750,7 @@
749750 if (ACPI_FAILURE(status)) {
750751 return_ACPI_STATUS(status);
751752 }
753
+
752754 acpi_ns_delete_namespace_by_owner(owner_id);
753755 acpi_ut_release_write_lock(&acpi_gbl_namespace_rw_lock);
754756 return_ACPI_STATUS(status);
....@@ -931,19 +933,9 @@
931933 }
932934
933935 status = acpi_ns_load_table(table_index, parent_node);
934
-
935
- /*
936
- * This case handles the legacy option that groups all module-level
937
- * code blocks together and defers execution until all of the tables
938
- * are loaded. Execute all of these blocks at this time.
939
- * Execute any module-level code that was detected during the table
940
- * load phase.
941
- *
942
- * Note: this option is deprecated and will be eliminated in the
943
- * future. Use of this option can cause problems with AML code that
944
- * depends upon in-order immediate execution of module-level code.
945
- */
946
- acpi_ns_exec_module_code_list();
936
+ if (ACPI_FAILURE(status)) {
937
+ return_ACPI_STATUS(status);
938
+ }
947939
948940 /*
949941 * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is