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

rafaeljw · rafaeljw · commit 43b28ca8dfb0 · 2015-12-26T22:20:24.000+01:00
* acpi-processor:
  ACPI / processor: Fix thermal cooling device regression

* pm-cpufreq:
  cpufreq: scpi-cpufreq: signedness bug in scpi_get_dvfs_info()
diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c
@@ -31,7 +31,7 @@ static struct scpi_ops *scpi_ops;
 
 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)
 		return ERR_PTR(-EINVAL);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ static struct scpi_ops *scpi_ops;`
`31`	`31`
`32`	`32`	`static struct scpi_dvfs_info scpi_get_dvfs_info(struct device cpu_dev)`
`33`	`33`	`{`
`34`		`- u8 domain = topology_physical_package_id(cpu_dev->id);`
	`34`	`+ int domain = topology_physical_package_id(cpu_dev->id);`
`35`	`35`
`36`	`36`	`if (domain < 0)`
`37`	`37`	`return ERR_PTR(-EINVAL);`