diff options
| author | Bob Moore <robert.moore@intel.com> | 2009-12-11 14:38:08 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-12-15 17:29:35 -0500 |
| commit | f2cb12510836da63cf459dca452fc0770da155f1 (patch) | |
| tree | 3799f9d965445582011581ec6d9b122932d1cf95 /drivers/acpi/acpica | |
| parent | 583061c59ffea1ea14f6dca735ab0f99238a7a92 (diff) | |
| download | linux-3.10-f2cb12510836da63cf459dca452fc0770da155f1.tar.gz linux-3.10-f2cb12510836da63cf459dca452fc0770da155f1.tar.bz2 linux-3.10-f2cb12510836da63cf459dca452fc0770da155f1.zip | |
ACPICA: Fix two Scope type error messages
Both messages incorrectly used the internal Path string instead
of 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')
| -rw-r--r-- | drivers/acpi/acpica/dswload.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/dswload.c b/drivers/acpi/acpica/dswload.c index 10fc7851784..1bab934e99f 100644 --- a/drivers/acpi/acpica/dswload.c +++ b/drivers/acpi/acpica/dswload.c @@ -212,18 +212,19 @@ acpi_ds_load1_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) { ... } * - * Note: silently change the type here. On the second pass, we will report - * a warning + * Note: silently change the type here. On the second pass, + * we will report a warning */ ACPI_DEBUG_PRINT((ACPI_DB_INFO, - "Type override - [%4.4s] had invalid type (%s) for Scope operator, changed to (Scope)\n", - path, + "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; @@ -235,8 +236,10 @@ acpi_ds_load1_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] (Cannot override)", - acpi_ut_get_type_name(node->type), path)); + "Invalid type (%s) for target of " + "Scope operator [%4.4s] (Cannot override)", + acpi_ut_get_type_name(node->type), + acpi_ut_get_node_name(node))); return_ACPI_STATUS(AE_AML_OPERAND_TYPE); } |