From: Hanjun Guo <hanjun.guo@linaro.org>
Date: Wed, 9 Sep 2015 14:26:37 +0000 (+0200)
Subject: ACPI / table: Replace '1' with specific error return values
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2574
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f025e6ddde98819083aadee11f776180cf5c6dce;p=xen.git

ACPI / table: Replace '1' with specific error return values

After commit 7f8f97c3cc (ACPI: acpi_table_parse() now returns
success/fail, not count), acpi_table_parse() returns '1' when it is
unable to find the table, but it should return a negative error code
in that case.  Make it return -ENODEV instead.

Fix the same problem in acpi_table_init() analogously.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
[rjw: Subject and changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
[Linux commit 95df812dbdc350bfcf31e247e9100c378a472480]
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---

diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c
index 6085fda847..60c4ab1d3a 100644
--- a/xen/drivers/acpi/tables.c
+++ b/xen/drivers/acpi/tables.c
@@ -290,7 +290,7 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler)
 	if (table) {
 		return handler(table);
 	} else
-		return 1;
+		return -ENODEV;
 }
 
 /* 
@@ -333,7 +333,7 @@ int __init acpi_table_init(void)
 
 	status = acpi_initialize_tables(NULL, ACPI_MAX_TABLES, 0);
 	if (ACPI_FAILURE(status))
-		return 1;
+		return -EINVAL;
 
 	check_multiple_madt();
 	return 0;