diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-05-19 15:55:15 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-06 10:11:04 -0700 |
commit | a48b0ab0a17f7cbc5dfef2546b670e61eeea0126 (patch) | |
tree | 3aed128966783f2eec2db983f4dca005e415e50f /drivers | |
parent | b30f01e1285830e4a13ee382ae1c36df2d07a50b (diff) | |
download | lwn-a48b0ab0a17f7cbc5dfef2546b670e61eeea0126.tar.gz lwn-a48b0ab0a17f7cbc5dfef2546b670e61eeea0126.zip |
ACPI: Reject below-freezing temperatures as invalid critical temperatures
commit a39a2d7c72b358c6253a2ec28e17b023b7f6f41c upstream
My laptop thinks that it's a good idea to give -73C as the critical
CPU temperature.... which isn't the best thing since it causes a shutdown
right at bootup.
Temperatures below freezing are clearly invalid critical thresholds
so just reject these as such.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/thermal.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 1bcecc7dd2ca..bc5fcc2109cc 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -359,10 +359,17 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) if (flag & ACPI_TRIPS_CRITICAL) { status = acpi_evaluate_integer(tz->device->handle, "_CRT", NULL, &tz->trips.critical.temperature); - if (ACPI_FAILURE(status)) { + /* + * Treat freezing temperatures as invalid as well; some + * BIOSes return really low values and cause reboots at startup. + * Below zero (Celcius) values clearly aren't right for sure.. + * ... so lets discard those as invalid. + */ + if (ACPI_FAILURE(status) || + tz->trips.critical.temperature <= 2732) { tz->trips.critical.flags.valid = 0; ACPI_EXCEPTION((AE_INFO, status, - "No critical threshold")); + "No or invalid critical threshold")); return -ENODEV; } else { tz->trips.critical.flags.valid = 1; |