aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2018-08-10 17:42:56 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-14 17:49:13 -0400
commit8a55c696d327008b003957d828ff04b81ead5dd1 (patch)
tree21cb832636b07ef0f7fcf62f6c55fde6b86154b0
parentf016b19a9275089a2ab06c2144567c2ad8d5d6ad (diff)
ACPICA: Update an error message for a duplicate table
In this case, the exception AE_ALREADY_EXISTS is more appropriate. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Erik Schmauss <erik.schmauss@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--drivers/acpi/acpica/tbdata.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/tbdata.c b/drivers/acpi/acpica/tbdata.c
index 51891f9fb057..862149c8a208 100644
--- a/drivers/acpi/acpica/tbdata.c
+++ b/drivers/acpi/acpica/tbdata.c
@@ -516,9 +516,9 @@ acpi_tb_verify_temp_table(struct acpi_table_desc *table_desc,
516 acpi_tb_check_duplication(table_desc, table_index); 516 acpi_tb_check_duplication(table_desc, table_index);
517 if (ACPI_FAILURE(status)) { 517 if (ACPI_FAILURE(status)) {
518 if (status != AE_CTRL_TERMINATE) { 518 if (status != AE_CTRL_TERMINATE) {
519 ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY, 519 ACPI_EXCEPTION((AE_INFO, status,
520 "%4.4s 0x%8.8X%8.8X" 520 "%4.4s 0x%8.8X%8.8X"
521 " Table is duplicated", 521 " Table is already loaded",
522 acpi_ut_valid_nameseg 522 acpi_ut_valid_nameseg
523 (table_desc->signature. 523 (table_desc->signature.
524 ascii) ? table_desc-> 524 ascii) ? table_desc->