diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-04-14 09:27:28 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-04-14 09:27:28 +0100 |
| commit | 157aa3fb92ca4d3c0dfa229de1d9c4966b2e95fb (patch) | |
| tree | 083b81e20af3b8a30809c28c7444493c2b6a4278 | |
| parent | ebd575414591e971dd1b7146e2879619c3cf271a (diff) | |
| parent | 10fad76e8c450ad6c155691ba0989dd7621a0f55 (diff) | |
Merge branch 'lsk-3.18-armlt-scpi' into integration-lsk-3.18-armlt-androidlsk-3.18-armlt-20160414
| -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 304d2057163e..35a503b7b19e 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); |