Skip to content

Commit

Permalink
ACPI / processor: Fix the return value of acpi_processor_ids_walk()
Browse files Browse the repository at this point in the history
ACPI driver should make sure all the processor IDs in their ACPI Namespace
are unique. the driver performs a depth-first walk of the namespace tree
and calls the acpi_processor_ids_walk() to check the duplicate IDs.

But, the acpi_processor_ids_walk() mistakes the return value. If a
processor is checked, it returns true which causes the walk break
immediately, and other processors will never be checked.

Repace the value with AE_OK which is the standard acpi_status value.
And don't abort the namespace walk even on error.

Fixes: 8c8cb30 (acpi/processor: Implement DEVICE operator for processor enumeration)
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Dou Liyang authored and Rafael J. Wysocki committed Oct 4, 2018
1 parent 17b57b1 commit d0381bf
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/acpi/acpi_processor.c
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@ static acpi_status __init acpi_processor_ids_walk(acpi_handle handle,

status = acpi_get_type(handle, &acpi_type);
if (ACPI_FAILURE(status))
return false;
return status;

switch (acpi_type) {
case ACPI_TYPE_PROCESSOR:
Expand All @@ -663,11 +663,12 @@ static acpi_status __init acpi_processor_ids_walk(acpi_handle handle,
}

processor_validated_ids_update(uid);
return true;
return AE_OK;

err:
/* Exit on error, but don't abort the namespace walk */
acpi_handle_info(handle, "Invalid processor object\n");
return false;
return AE_OK;

}

Expand Down

0 comments on commit d0381bf

Please sign in to comment.