From: Len Brown Date: Wed, 8 Jul 2009 03:22:58 +0000 (-0400) Subject: ACPI: check acpi_disabled in acpi_table_parse() and acpi_table_parse_entries() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5b8fc6ac158f65598f58dba2c0d52ba3b412f52;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 646d39c031ca..f336bca7c450 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -213,6 +213,9 @@ acpi_table_parse_entries(char *id, unsigned long table_end; acpi_size tbl_size; + if (acpi_disabled) + return -ENODEV; + if (!handler) return -EINVAL; @@ -277,6 +280,9 @@ int __init acpi_table_parse(char *id, acpi_table_handler handler) struct acpi_table_header *table = NULL; acpi_size tbl_size; + if (acpi_disabled) + return -ENODEV; + if (!handler) return -EINVAL;