aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>2014-11-12 18:43:29 -0500
committerZhang Rui <rui.zhang@intel.com>2014-12-07 22:51:46 -0500
commit84ffe3ecc2c8b3effc41c0babd2cc24f1edb2aab (patch)
tree6bc2af15d65ac66d08fcf9dcd240b69b06c15f86
parent009d0431c3914de64666bec0d350e54fdd59df6a (diff)
thermal: core: ignore invalid trip temperature
Ignore invalid trip temperature less or equal to zero. Some buggy systems have invalid trips, causing system shutdown. Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
-rw-r--r--drivers/thermal/thermal_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 43b90709585f..5aa57736fa9e 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -368,7 +368,7 @@ static void handle_critical_trips(struct thermal_zone_device *tz,
368 tz->ops->get_trip_temp(tz, trip, &trip_temp); 368 tz->ops->get_trip_temp(tz, trip, &trip_temp);
369 369
370 /* If we have not crossed the trip_temp, we do not care. */ 370 /* If we have not crossed the trip_temp, we do not care. */
371 if (tz->temperature < trip_temp) 371 if (trip_temp <= 0 || tz->temperature < trip_temp)
372 return; 372 return;
373 373
374 trace_thermal_zone_trip(tz, trip, trip_type); 374 trace_thermal_zone_trip(tz, trip, trip_type);