Merge "drivers: thermal: Update the set_trips for hysteresis change" into msm-4.9

drivers/thermal/thermal_core.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -811,7 +811,6 @@ trip_point_hyst_store(struct device dev, struct device_attribute attr,
		*/
		ret = tz->ops->set_trip_hyst(tz, trip, temperature);

		if (!ret)
		thermal_zone_set_trips(tz);

		return ret ? ret : count;