aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-26 22:20:24 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-26 22:20:24 +0100
commit43b28ca8dfb07f2faa44204b3b3e7cb016468847 (patch)
treea028667bde528999ccf6d2f086a60080b658f7ee
parentce360db703c98bd51fffe6f5d04a9e2294950514 (diff)
parenta7def561c2ad8572c5d016ac96949e5e9999965f (diff)
downloadlinux-stericsson-43b28ca8dfb07f2faa44204b3b3e7cb016468847.tar.gz
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()
-rw-r--r--drivers/cpufreq/scpi-cpufreq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpufreq/scpi-cpufreq.c b/drivers/cpufreq/scpi-cpufreq.c
index 2c3b16fd3a01..de5e89b2eaaa 100644
--- 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);