1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c
index c03500b4cc7a..74f97d74db1c 100644
--- a/drivers/acpi/acpica/tbinstal.c
+++ b/drivers/acpi/acpica/tbinstal.c
@@ -138,13 +138,14 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc, u32 *table_index)
        if ((table_desc->pointer->signature[0] != 0x00) &&
            (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
            && (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {
-                ACPI_ERROR((AE_INFO,
+                ACPI_BIOS_ERROR((AE_INFO,
-                            "Table has invalid signature [%4.4s] (0x%8.8X), must be SSDT or OEMx",
+                                 "Table has invalid signature [%4.4s] (0x%8.8X), "
-                            acpi_ut_valid_acpi_name(*(u32 *)table_desc->
+                                 "must be SSDT or OEMx",
-                                                    pointer->
+                                 acpi_ut_valid_acpi_name(*(u32 *)table_desc->
-                                                    signature) ? table_desc->
+                                                         pointer->
-                            pointer->signature : "????",
+                                                         signature) ?
-                            *(u32 *)table_desc->pointer->signature));
+                                 table_desc->pointer->signature : "????",
+                                 *(u32 *)table_desc->pointer->signature));
                return_ACPI_STATUS(AE_BAD_SIGNATURE);
        }
@@ -396,10 +397,10 @@ acpi_status acpi_tb_resize_root_table_list(void)
 *
 * FUNCTION:    acpi_tb_store_table
 *
- * PARAMETERS:  Address             - Table address
+ * PARAMETERS:  address             - Table address
- *              Table               - Table header
+ *              table               - Table header
- *              Length              - Table length
+ *              length              - Table length
- *              Flags               - flags
+ *              flags               - flags
 *
 * RETURN:      Status and table index.
 *

diff --git a/drivers/acpi/acpica/tbinstal.c b/drivers/acpi/acpica/tbinstal.c index c03500b4cc7a..74f97d74db1c 100644 --- a/drivers/acpi/acpica/tbinstal.c +++ b/drivers/acpi/acpica/tbinstal.c
@@ -138,13 +138,14 @@ acpi_tb_add_table(struct acpi_table_desc table_desc, u32 table_index)
138	if ((table_desc->pointer->signature[0] != 0x00) &&	138	if ((table_desc->pointer->signature[0] != 0x00) &&
139	(!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))	139	(!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT))
140	&& (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {	140	&& (ACPI_STRNCMP(table_desc->pointer->signature, "OEM", 3))) {
141	ACPI_ERROR((AE_INFO,	141	ACPI_BIOS_ERROR((AE_INFO,
142	"Table has invalid signature [%4.4s] (0x%8.8X), must be SSDT or OEMx",	142	"Table has invalid signature [%4.4s] (0x%8.8X), "
143	acpi_ut_valid_acpi_name((u32 )table_desc->	143	"must be SSDT or OEMx",
144	pointer->	144	acpi_ut_valid_acpi_name((u32 )table_desc->
145	signature) ? table_desc->	145	pointer->
146	pointer->signature : "????",	146	signature) ?
147	(u32 )table_desc->pointer->signature));	147	table_desc->pointer->signature : "????",
		148	(u32 )table_desc->pointer->signature));
148		149
149	return_ACPI_STATUS(AE_BAD_SIGNATURE);	150	return_ACPI_STATUS(AE_BAD_SIGNATURE);
150	}	151	}
@@ -396,10 +397,10 @@ acpi_status acpi_tb_resize_root_table_list(void)
396	*	397	*
397	* FUNCTION: acpi_tb_store_table	398	* FUNCTION: acpi_tb_store_table
398	*	399	*
399	* PARAMETERS: Address - Table address	400	* PARAMETERS: address - Table address
400	* Table - Table header	401	* table - Table header
401	* Length - Table length	402	* length - Table length
402	* Flags - flags	403	* flags - flags
403	*	404	*
404	* RETURN: Status and table index.	405	* RETURN: Status and table index.
405	*	406	*