commit e52ce860a58f6726d835a7db4842e9c4a5f6d07d
author Linux Build Service Account <lnxbuild@localhost> Wed Aug 21 16:34:58 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Aug 21 16:34:57 2013 -0700
tree 02d99cc61c580a719b1330d1bf6be0457e1f8c8a
parent e0d0dc05ee136e0b8c20c1a1e3549509260f0adb
parent 718bf6417b4446ac8c701d74c64b84fb4c646d39

Merge "thermal: msm: tsens: Notify thermal framework on threshold cross"

drivers/thermal/msm8974-tsens.c

diff --git a/drivers/thermal/msm8974-tsens.c b/drivers/thermal/msm8974-tsens.c
index 69031dc..fcc5a8d 100644
--- a/drivers/thermal/msm8974-tsens.c
+++ b/drivers/thermal/msm8974-tsens.c
@@ -664,6 +664,15 @@
 			lower_thr = true;
 		}
 		if (upper_thr || lower_thr) {
+			unsigned long temp;
+			enum thermal_trip_type trip =
+					THERMAL_TRIP_CONFIGURABLE_LOW;
+
+			if (upper_thr)
+				trip = THERMAL_TRIP_CONFIGURABLE_HI;
+			tsens_tz_get_temp(tm->sensor[i].tz_dev, &temp);
+			thermal_sensor_trip(tm->sensor[i].tz_dev, trip, temp);
+
 			/* Notify user space */
 			queue_work(tm->tsens_wq, &tm->sensor[i].work);
 			rc = tsens_get_sw_id_mapping(