Merge "drivers: thermal: Update the set_trips for hysteresis change" into msm-4.9
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 8f98c09..b137c4e 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -811,8 +811,7 @@
 	 */
 	ret = tz->ops->set_trip_hyst(tz, trip, temperature);
 
-	if (!ret)
-		thermal_zone_set_trips(tz);
+	thermal_zone_set_trips(tz);
 
 	return ret ? ret : count;
 }