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/db8500_thermal.c | |
| parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) | |
| parent | 9a5238a9c6c33dd31525f2bba4aa1af4f8374ae1 (diff) | |
| download | linux-53daf9383f34d7bf61358a37449fb4d59fbdafc2.tar.gz linux-53daf9383f34d7bf61358a37449fb4d59fbdafc2.tar.bz2 linux-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/db8500_thermal.c')
| -rw-r--r-- | drivers/thermal/db8500_thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/db8500_thermal.c b/drivers/thermal/db8500_thermal.c index 20adfbe27df1..2fb273c4baa9 100644 --- a/drivers/thermal/db8500_thermal.c +++ b/drivers/thermal/db8500_thermal.c @@ -76,7 +76,7 @@ static int db8500_cdev_bind(struct thermal_zone_device *thermal, upper = lower = i > max_state ? max_state : i; ret = thermal_zone_bind_cooling_device(thermal, i, cdev, - upper, lower); + upper, lower, THERMAL_WEIGHT_DEFAULT); dev_info(&cdev->device, "%s bind to %d: %d-%s\n", cdev->type, i, ret, ret ? "fail" : "succeed"); |