]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ACPICA: Update an error message for a duplicate table
authorBob Moore <robert.moore@intel.com>
Fri, 10 Aug 2018 21:42:56 +0000 (14:42 -0700)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 14 Aug 2018 21:49:13 +0000 (23:49 +0200)
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>
drivers/acpi/acpica/tbdata.c

index 51891f9fb05709ca9084c2d95afd7117b6575450..862149c8a208e6fdc3be390bdacfa5aefd44b1c0 100644 (file)
@@ -516,9 +516,9 @@ acpi_tb_verify_temp_table(struct acpi_table_desc *table_desc,
                            acpi_tb_check_duplication(table_desc, table_index);
                        if (ACPI_FAILURE(status)) {
                                if (status != AE_CTRL_TERMINATE) {
-                                       ACPI_EXCEPTION((AE_INFO, AE_NO_MEMORY,
+                                       ACPI_EXCEPTION((AE_INFO, status,
                                                        "%4.4s 0x%8.8X%8.8X"
-                                                       " Table is duplicated",
+                                                       " Table is already loaded",
                                                        acpi_ut_valid_nameseg
                                                        (table_desc->signature.
                                                         ascii) ? table_desc->