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

Commit 43b28ca8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-processor' and 'pm-cpufreq' 

* acpi-processor:
  ACPI / processor: Fix thermal cooling device regression

* pm-cpufreq:
  cpufreq: scpi-cpufreq: signedness bug in scpi_get_dvfs_info()
parents ce360db7 a7def561

drivers/cpufreq/scpi-cpufreq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ static struct scpi_ops *scpi_ops; 




static struct scpi_dvfs_info *scpi_get_dvfs_info(struct device *cpu_dev)

static struct scpi_dvfs_info *scpi_get_dvfs_info(struct device *cpu_dev)

{

{

	u8 domain = topology_physical_package_id(cpu_dev->id);

	int domain = topology_physical_package_id(cpu_dev->id);





	if (domain < 0)

	if (domain < 0)

		return ERR_PTR(-EINVAL);

		return ERR_PTR(-EINVAL);