diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-12-21 22:49:12 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-21 22:49:12 +0800 |
| commit | 32c9edc4e356063e0218362d452a269cfa6798ee (patch) | |
| tree | 43982a1f642c7fedef1cc5f8c247b646582cbe03 /drivers/thermal/samsung/exynos_thermal_common.c | |
| parent | 59c56eb6db0c14fe569b1c9625cb850e52d29d88 (diff) | |
| parent | 503ccc3fec4a56cdcfedc507cd1ea0d85e1fbfa2 (diff) | |
| download | linux-stable-32c9edc4e356063e0218362d452a269cfa6798ee.tar.gz linux-stable-32c9edc4e356063e0218362d452a269cfa6798ee.tar.bz2 linux-stable-32c9edc4e356063e0218362d452a269cfa6798ee.zip | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/samsung/exynos_thermal_common.c')
| -rw-r--r-- | drivers/thermal/samsung/exynos_thermal_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c index b6be572704a4..6dc3815cc73f 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.c +++ b/drivers/thermal/samsung/exynos_thermal_common.c @@ -347,7 +347,6 @@ void exynos_report_trigger(struct thermal_sensor_conf *conf) int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) { int ret; - struct cpumask mask_val; struct exynos_thermal_zone *th_zone; if (!sensor_conf || !sensor_conf->read_temperature) { @@ -367,13 +366,14 @@ int exynos_register_thermal(struct thermal_sensor_conf *sensor_conf) * sensor */ if (sensor_conf->cooling_data.freq_clip_count > 0) { - cpumask_set_cpu(0, &mask_val); th_zone->cool_dev[th_zone->cool_dev_size] = - cpufreq_cooling_register(&mask_val); + cpufreq_cooling_register(cpu_present_mask); if (IS_ERR(th_zone->cool_dev[th_zone->cool_dev_size])) { - dev_err(sensor_conf->dev, - "Failed to register cpufreq cooling device\n"); - ret = -EINVAL; + ret = PTR_ERR(th_zone->cool_dev[th_zone->cool_dev_size]); + if (ret != -EPROBE_DEFER) + dev_err(sensor_conf->dev, + "Failed to register cpufreq cooling device: %d\n", + ret); goto err_unregister; } th_zone->cool_dev_size++; |