ACPICA: Make acpi_ex_load_op() match upstream

The acpi_ex_load_op() code has slightly diverged from the upstream
implementation, so correct that to make the behavior consistent with
the upstream and avoid patch backporting issues going forward.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index d7d74ef87b186164b1e45e9a19279df192f743d3..e82faabdf9072888a04c2d7b308ca6310999ab99 100644 (file)
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -295,8 +295,8 @@ acpi_ex_load_op(union acpi_operand_object *obj_desc,
                                                 target));
        }
        if (target->common.type != ACPI_TYPE_INTEGER) {
-               ACPI_EXCEPTION((AE_INFO, AE_TYPE,
-                               "Type not integer: %X\n", target->common.type));
+               ACPI_ERROR((AE_INFO, "Type not integer: %X",
+                           target->common.type));
                return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
        }