aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2018-08-10 14:42:56 -0700
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-08-14 23:49:13 +0200
commit8a55c696d327008b003957d828ff04b81ead5dd1 (patch)
tree21cb832636b07ef0f7fcf62f6c55fde6b86154b0 /drivers/acpi
parentACPICA: ACPICA: add status check for acpi_hw_read before assigning return value (diff)
downloadlinux-dev-8a55c696d327008b003957d828ff04b81ead5dd1.tar.xz
linux-dev-8a55c696d327008b003957d828ff04b81ead5dd1.zip
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>
Diffstat (limited to 'drivers/acpi')
-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,
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->