diff options
| author | Rafael J. Wysocki <[email protected]> | 2019-05-06 08:49:01 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2019-05-06 08:49:01 +0000 |
| commit | 317e2cac4551879f14eb383fd4e5469f29231a0d (patch) | |
| tree | 3d12ea38a84b455b4e52598abb14fd6e176096c5 /drivers/acpi/tables.c | |
| parent | Revert "ACPICA: Clear status of GPEs before enabling them" (diff) | |
| parent | Merge back ACPICA changes for v5.2. (diff) | |
| download | kernel-317e2cac4551879f14eb383fd4e5469f29231a0d.tar.gz kernel-317e2cac4551879f14eb383fd4e5469f29231a0d.zip | |
Merge branch 'acpica'
* acpica:
ACPICA: Update version to 20190405
ACPICA: Namespace: add check to avoid null pointer dereference
ACPICA: Update version to 20190329
ACPICA: utilities: fix spelling of PCC to platform_comm_channel
ACPICA: Rename nameseg length macro/define for clarity
ACPICA: Rename nameseg compare macro for clarity
ACPICA: Rename nameseg copy macro for clarity
Diffstat (limited to 'drivers/acpi/tables.c')
| -rw-r--r-- | drivers/acpi/tables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index 8fccbe49612a..1ffd7b9eefc5 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -670,8 +670,8 @@ static void __init acpi_table_initrd_scan(void) table_length = table->length; /* Skip RSDT/XSDT which should only be used for override */ - if (ACPI_COMPARE_NAME(table->signature, ACPI_SIG_RSDT) || - ACPI_COMPARE_NAME(table->signature, ACPI_SIG_XSDT)) { + if (ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_RSDT) || + ACPI_COMPARE_NAMESEG(table->signature, ACPI_SIG_XSDT)) { acpi_os_unmap_memory(table, ACPI_HEADER_SIZE); goto next_table; } |