summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-05-06 10:49:01 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-05-06 10:49:01 +0200
commit317e2cac4551879f14eb383fd4e5469f29231a0d (patch)
tree3d12ea38a84b455b4e52598abb14fd6e176096c5 /drivers/acpi/scan.c
parent2c2a2fb1e2a9256714338875bede6b7cbd4b9542 (diff)
parentf456277ee15ff5d150191cb4a2f0181a8804c851 (diff)
downloadblackbird-op-linux-317e2cac4551879f14eb383fd4e5469f29231a0d.tar.gz
blackbird-op-linux-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/scan.c')
-rw-r--r--drivers/acpi/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 446c959a8f08..3fb331fb6e82 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2260,7 +2260,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
mutex_lock(&acpi_probe_mutex);
for (ape = ap_head; nr; ape++, nr--) {
- if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
+ if (ACPI_COMPARE_NAMESEG(ACPI_SIG_MADT, ape->id)) {
acpi_probe_count = 0;
acpi_table_parse_madt(ape->type, acpi_match_madt, 0);
count += acpi_probe_count;
OpenPOWER on IntegriCloud