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/acpi | |
| 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/acpi')
| -rw-r--r-- | drivers/acpi/thermal.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index d24fa1964eb8..6d4e44ea74ac 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -800,7 +800,8 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, result = thermal_zone_bind_cooling_device (thermal, trip, cdev, - THERMAL_NO_LIMIT, THERMAL_NO_LIMIT); + THERMAL_NO_LIMIT, THERMAL_NO_LIMIT, + THERMAL_WEIGHT_DEFAULT); else result = thermal_zone_unbind_cooling_device @@ -824,7 +825,8 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, if (bind) result = thermal_zone_bind_cooling_device (thermal, trip, cdev, - THERMAL_NO_LIMIT, THERMAL_NO_LIMIT); + THERMAL_NO_LIMIT, THERMAL_NO_LIMIT, + THERMAL_WEIGHT_DEFAULT); else result = thermal_zone_unbind_cooling_device (thermal, trip, cdev); @@ -841,7 +843,8 @@ static int acpi_thermal_cooling_device_cb(struct thermal_zone_device *thermal, result = thermal_zone_bind_cooling_device (thermal, THERMAL_TRIPS_NONE, cdev, THERMAL_NO_LIMIT, - THERMAL_NO_LIMIT); + THERMAL_NO_LIMIT, + THERMAL_WEIGHT_DEFAULT); else result = thermal_zone_unbind_cooling_device (thermal, THERMAL_TRIPS_NONE, |