summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/dswload.c
diff options
context:
space:
mode:
authorBob Moore <robert.moore@intel.com>2009-12-11 14:40:17 +0800
committerLen Brown <len.brown@intel.com>2009-12-15 17:29:35 -0500
commitebdca3edd5ac61e37f2f5e7c11006c1a68d3cc7e (patch)
treec94e25b6b7989bfce04f45811143ea4849973ebb /drivers/acpi/acpica/dswload.c
parentf2cb12510836da63cf459dca452fc0770da155f1 (diff)
downloadop-kernel-dev-ebdca3edd5ac61e37f2f5e7c11006c1a68d3cc7e.zip
op-kernel-dev-ebdca3edd5ac61e37f2f5e7c11006c1a68d3cc7e.tar.gz
ACPICA: Fix two additional Scope override error messages
These messages were using the internal path for the message instead of using the node name. Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/dswload.c')
-rw-r--r--drivers/acpi/acpica/dswload.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c
index 1bab934..9cc2289 100644
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
@@ -700,15 +700,16 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
case ACPI_TYPE_BUFFER:
/*
- * These types we will allow, but we will change the type. This
- * enables some existing code of the form:
+ * These types we will allow, but we will change the type.
+ * This enables some existing code of the form:
*
* Name (DEB, 0)
* Scope (DEB) { ... }
*/
ACPI_WARNING((AE_INFO,
- "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)",
- buffer_ptr,
+ "Type override - [%4.4s] had invalid type (%s) "
+ "for Scope operator, changed to type ANY\n",
+ acpi_ut_get_node_name(node),
acpi_ut_get_type_name(node->type)));
node->type = ACPI_TYPE_ANY;
@@ -720,9 +721,10 @@ acpi_ds_load2_begin_op(struct acpi_walk_state *walk_state,
/* All other types are an error */
ACPI_ERROR((AE_INFO,
- "Invalid type (%s) for target of Scope operator [%4.4s]",
+ "Invalid type (%s) for target of "
+ "Scope operator [%4.4s] (Cannot override)",
acpi_ut_get_type_name(node->type),
- buffer_ptr));
+ acpi_ut_get_node_name(node)));
return (AE_AML_OPERAND_TYPE);
}
OpenPOWER on IntegriCloud