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/ti-soc-thermal | |
| parent | 59c56eb6db0c14fe569b1c9625cb850e52d29d88 (diff) | |
| parent | 503ccc3fec4a56cdcfedc507cd1ea0d85e1fbfa2 (diff) | |
| download | linux-32c9edc4e356063e0218362d452a269cfa6798ee.tar.gz linux-32c9edc4e356063e0218362d452a269cfa6798ee.tar.bz2 linux-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/ti-soc-thermal')
| -rw-r--r-- | drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index 5fd03865e396..3fb054a10f6a 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -28,7 +28,6 @@ #include <linux/kernel.h> #include <linux/workqueue.h> #include <linux/thermal.h> -#include <linux/cpufreq.h> #include <linux/cpumask.h> #include <linux/cpu_cooling.h> #include <linux/of.h> @@ -407,17 +406,17 @@ int ti_thermal_register_cpu_cooling(struct ti_bandgap *bgp, int id) if (!data) return -EINVAL; - if (!cpufreq_get_current_driver()) { - dev_dbg(bgp->dev, "no cpufreq driver yet\n"); - return -EPROBE_DEFER; - } - /* Register cooling device */ data->cool_dev = cpufreq_cooling_register(cpu_present_mask); if (IS_ERR(data->cool_dev)) { - dev_err(bgp->dev, - "Failed to register cpufreq cooling device\n"); - return PTR_ERR(data->cool_dev); + int ret = PTR_ERR(data->cool_dev); + + if (ret != -EPROBE_DEFER) + dev_err(bgp->dev, + "Failed to register cpu cooling device %d\n", + ret); + + return ret; } ti_bandgap_set_sensor_data(bgp, id, data); |