Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3da7cb9 authored by Hanjun Guo's avatar Hanjun Guo Committed by Rafael J. Wysocki
Browse files

ACPI / processor: return specific error instead of -1 



Since invalid_logical_cpuid() can check error values, so
return specific error instead of -1 for acpi_map_cpuid().

Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8416c5bd

drivers/acpi/processor_core.c

+3 −3
Original line number Diff line number Diff line
@@ -215,12 +215,12 @@ int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id) 
		 * Ignores phys_id and always returns 0 for the processor

		 * handle with acpi id 0 if nr_cpu_ids is 1.

		 * This should be the case if SMP tables are not found.

		 * Return -1 for other CPU's handle.

		 * Return -EINVAL for other CPU's handle.

		 */

		if (nr_cpu_ids <= 1 && acpi_id == 0)

			return acpi_id;

		else

			return -1;

			return -EINVAL;

	}



#ifdef CONFIG_SMP
@@ -233,7 +233,7 @@ int acpi_map_cpuid(phys_cpuid_t phys_id, u32 acpi_id) 
	if (phys_id == 0)

		return phys_id;

#endif

	return -1;

	return -ENODEV;

}



int acpi_get_cpuid(acpi_handle handle, int type, u32 acpi_id)