diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 04:55:42 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 04:55:42 +0200 |
| commit | 53daf9383f34d7bf61358a37449fb4d59fbdafc2 (patch) | |
| tree | fc48ebe4fbf8e6c48cc07fcdab82a6010f7c61cf /drivers/platform | |
| parent | Linux 4.1-rc4 (diff) | |
| parent | thermal: hisilicon: add new hisilicon thermal sensor driver (diff) | |
| download | linux-53daf9383f34d7bf61358a37449fb4d59fbdafc2.tar.xz 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/platform')
| -rw-r--r-- | drivers/platform/x86/acerhdf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 594c918b553d..1ef02daddb60 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c @@ -372,7 +372,8 @@ static int acerhdf_bind(struct thermal_zone_device *thermal, return 0; if (thermal_zone_bind_cooling_device(thermal, 0, cdev, - THERMAL_NO_LIMIT, THERMAL_NO_LIMIT)) { + THERMAL_NO_LIMIT, THERMAL_NO_LIMIT, + THERMAL_WEIGHT_DEFAULT)) { pr_err("error binding cooling dev\n"); return -EINVAL; } |