aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>2013-01-15 23:57:16 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-26 00:34:21 +0100
commitca4e713080dd7f23cd1cf5d3871e0b717ee9b254 (patch)
tree2e14455e52dd7b0bcdac3f473ced3e6ee8c56a95 /drivers/acpi
parentACPI thermal: remove unnecessary newline from exception message (diff)
downloadlinux-dev-ca4e713080dd7f23cd1cf5d3871e0b717ee9b254.tar.xz
linux-dev-ca4e713080dd7f23cd1cf5d3871e0b717ee9b254.zip
ACPI / thermal: Use mode to enable/disable kernel thermal processing
As per documentation, "mode" sysfs interface should be able to enable/disable thermal processing in the kernel, so that user space is able to take more control. Currently, ACPI thermal driver is not following this setting, so modify it to match the interface documentation. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/thermal.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index f46c44048e44..dc047336cc37 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -531,6 +531,10 @@ static void acpi_thermal_check(void *data)
{
struct acpi_thermal *tz = data;
+ if (!tz->tz_enabled) {
+ pr_warn("thermal zone is disabled \n");
+ return;
+ }
thermal_zone_device_update(tz->thermal_zone);
}