From 865d791263eb55c470979b2a22c4ff0568a920a3 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Mon, 18 Jan 2016 14:53:41 +0100 Subject: [PATCH] ACPI: check acpi_disabled in acpi_table_parse() and acpi_table_parse_entries() Allow consumers of the acpi_table_parse()/acpi_table_parse_entries() API to gracefully handle the acpi_disabled=1 case via return value rather than checking the global flag themselves. Signed-off-by: Feng Tang Signed-off-by: Len Brown [Linux commit e5b8fc6ac158f65598f58dba2c0d52ba3b412f52] Signed-off-by: Shannon Zhao --- xen/drivers/acpi/tables.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xen/drivers/acpi/tables.c b/xen/drivers/acpi/tables.c index 60c4ab1d3a..39f12231ff 100644 --- a/xen/drivers/acpi/tables.c +++ b/xen/drivers/acpi/tables.c @@ -210,6 +210,9 @@ acpi_table_parse_entries(char *id, unsigned int count = 0; unsigned long table_end; + if (acpi_disabled) + return -ENODEV; + if (!handler) return -EINVAL; @@ -279,6 +282,9 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) { struct acpi_table_header *table = NULL; + if (acpi_disabled) + return -ENODEV; + if (!handler) return -EINVAL; -- 2.30.2