ACPICA: Make acpi_ex_load_op() match upstream

Message ID 2133883.Mh6RI2rZIc@kreacher
State New
Headers
Series ACPICA: Make acpi_ex_load_op() match upstream |

Commit Message

Rafael J. Wysocki Oct. 27, 2022, 6:02 p.m. UTC
  From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

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>
---
 drivers/acpi/acpica/exconfig.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Patch

Index: linux-pm/drivers/acpi/acpica/exconfig.c
===================================================================
--- linux-pm.orig/drivers/acpi/acpica/exconfig.c
+++ linux-pm/drivers/acpi/acpica/exconfig.c
@@ -295,8 +295,8 @@  acpi_ex_load_op(union acpi_operand_objec
 						 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);
 	}