diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 10:55:42 +0800 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 10:55:42 +0800 |
commit | 53daf9383f34d7bf61358a37449fb4d59fbdafc2 (patch) | |
tree | fc48ebe4fbf8e6c48cc07fcdab82a6010f7c61cf /drivers/thermal/ti-soc-thermal/ti-thermal-common.c | |
parent | Linux 4.1-rc4 (diff) | |
parent | thermal: hisilicon: add new hisilicon thermal sensor driver (diff) | |
download | linux-dev-53daf9383f34d7bf61358a37449fb4d59fbdafc2.tar.xz linux-dev-53daf9383f34d7bf61358a37449fb4d59fbdafc2.zip |
Merge branch 'linus' 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/ti-thermal-common.c')
-rw-r--r-- | drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c index a38c1756442a..c7c5b3779dac 100644 --- a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c +++ b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c @@ -75,7 +75,7 @@ static inline int ti_thermal_hotspot_temperature(int t, int s, int c) } /* thermal zone ops */ -/* Get temperature callback function for thermal zone*/ +/* Get temperature callback function for thermal zone */ static inline int __ti_thermal_get_temp(void *devdata, long *temp) { struct thermal_zone_device *pcb_tz = NULL; @@ -146,7 +146,8 @@ static int ti_thermal_bind(struct thermal_zone_device *thermal, return thermal_zone_bind_cooling_device(thermal, 0, cdev, /* bind with min and max states defined by cpu_cooling */ THERMAL_NO_LIMIT, - THERMAL_NO_LIMIT); + THERMAL_NO_LIMIT, + THERMAL_WEIGHT_DEFAULT); } /* Unbind callback functions for thermal zone */ |