Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 98005
b: refs/heads/master
c: bc45b1d
h: refs/heads/master
i:
  98003: edf1091
v: v3
  • Loading branch information
Bob Moore authored and Len Brown committed Jun 11, 2008
1 parent f3de935 commit 25d5123
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7aa7d4336df34e32195557a1ad422627bd69ef0b
refs/heads/master: bc45b1d39a925b56796bebf8a397a0491489d85c
25 changes: 7 additions & 18 deletions trunk/drivers/acpi/tables/tbinstal.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,24 +123,13 @@ acpi_tb_add_table(struct acpi_table_desc *table_desc,
}
}

/* The table must be either an SSDT or a PSDT or an OEMx */

if (!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_PSDT)&&
!ACPI_COMPARE_NAME(table_desc->pointer->signature, ACPI_SIG_SSDT)&&
strncmp(table_desc->pointer->signature, "OEM", 3)) {
/* Check for a printable name */
if (acpi_ut_valid_acpi_name(
*(u32 *) table_desc->pointer->signature)) {
ACPI_ERROR((AE_INFO, "Table has invalid signature "
"[%4.4s], must be SSDT or PSDT",
table_desc->pointer->signature));
} else {
ACPI_ERROR((AE_INFO, "Table has invalid signature "
"(0x%8.8X), must be SSDT or PSDT",
*(u32 *) table_desc->pointer->signature));
}
return_ACPI_STATUS(AE_BAD_SIGNATURE);
}
/*
* Originally, we checked the table signature for "SSDT" or "PSDT" here.
* Next, we added support for OEMx tables, signature "OEM".
* Valid tables were encountered with a null signature, so we've just
* given up on validating the signature, since it seems to be a waste
* of code. The original code was removed (05/2008).
*/

(void)acpi_ut_acquire_mutex(ACPI_MTX_TABLES);

Expand Down

0 comments on commit 25d5123

Please sign in to comment.