diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-26 16:20:24 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-12-26 16:20:24 -0500 |
| commit | 43b28ca8dfb07f2faa44204b3b3e7cb016468847 (patch) | |
| tree | a028667bde528999ccf6d2f086a60080b658f7ee | |
| parent | ce360db703c98bd51fffe6f5d04a9e2294950514 (diff) | |
| parent | a7def561c2ad8572c5d016ac96949e5e9999965f (diff) | |
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.c | 2 |
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; | |||
| 31 | 31 | ||
| 32 | static struct scpi_dvfs_info *scpi_get_dvfs_info(struct device *cpu_dev) | 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 | if (domain < 0) | 36 | if (domain < 0) |
| 37 | return ERR_PTR(-EINVAL); | 37 | return ERR_PTR(-EINVAL); |