aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/exstoren.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2015-10-19 10:24:58 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-10-22 02:01:12 +0200
commita5922a1f738b077c9f341f4bf3c02be436d39687 (patch)
tree9a1d4b4818242ef99dad9752a8f93201b03e2dfa /drivers/acpi/acpica/exstoren.c
parentACPICA: Update NFIT table to rename a flags field (diff)
downloadlinux-dev-a5922a1f738b077c9f341f4bf3c02be436d39687.tar.xz
linux-dev-a5922a1f738b077c9f341f4bf3c02be436d39687.zip
ACPICA: Improve typechecking, both compile-time and runtime
ACPICA commit 8d0f96e2a11a4ceabb2cae4b41e0ce1f4d3786b9 Adds much stricter typechecking in the iASL compiler, and also adds some additional checking in the interpreter. Link: https://github.com/acpica/acpica/commit/8d0f96e2 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/exstoren.c')
-rw-r--r--drivers/acpi/acpica/exstoren.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/exstoren.c b/drivers/acpi/acpica/exstoren.c
index 3101607b4efe..d1841defa669 100644
--- a/drivers/acpi/acpica/exstoren.c
+++ b/drivers/acpi/acpica/exstoren.c
@@ -122,9 +122,10 @@ acpi_ex_resolve_object(union acpi_operand_object **source_desc_ptr,
/* Conversion successful but still not a valid type */
ACPI_ERROR((AE_INFO,
- "Cannot assign type %s to %s (must be type Int/Str/Buf)",
+ "Cannot assign type [%s] to [%s] (must be type Int/Str/Buf)",
acpi_ut_get_object_type_name(source_desc),
acpi_ut_get_type_name(target_type)));
+
status = AE_AML_OPERAND_TYPE;
}
break;
@@ -275,7 +276,7 @@ acpi_ex_store_object_to_object(union acpi_operand_object *source_desc,
/*
* All other types come here.
*/
- ACPI_WARNING((AE_INFO, "Store into type %s not implemented",
+ ACPI_WARNING((AE_INFO, "Store into type [%s] not implemented",
acpi_ut_get_object_type_name(dest_desc)));
status = AE_NOT_IMPLEMENTED;