Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29321357 authored by Vladimir Zajac's avatar Vladimir Zajac Committed by Len Brown
Browse files

thermal: fix off-by-1 error in trip point trigger condition 



This patch fixes a regression caused by commit
b1569e99
"ACPI: move thermal trip handling to generic thermal layer"
which accidentally changed trip point trigger condition to
  temp > trip_temp

This patch changes the trigger condition back to
  temp >= trip_temp

Signed-off-by: default avatarVladimir Zajac <eightgraph@gmail.com>
Acked-by: default avatarZhang Rui <rui.zhang@intel.com>
Acked-by: default avatarMatthew Garrett <mjg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 091bf762

drivers/thermal/thermal_sys.c

+4 −4
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) 


		switch (trip_type) {

		case THERMAL_TRIP_CRITICAL:

			if (temp > trip_temp) {

			if (temp >= trip_temp) {

				if (tz->ops->notify)

					ret = tz->ops->notify(tz, count,

							      trip_type);
@@ -974,7 +974,7 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) 
			}

			break;

		case THERMAL_TRIP_HOT:

			if (temp > trip_temp)

			if (temp >= trip_temp)

				if (tz->ops->notify)

					tz->ops->notify(tz, count, trip_type);

			break;
@@ -986,14 +986,14 @@ void thermal_zone_device_update(struct thermal_zone_device *tz) 


				cdev = instance->cdev;



				if (temp > trip_temp)

				if (temp >= trip_temp)

					cdev->ops->set_cur_state(cdev, 1);

				else

					cdev->ops->set_cur_state(cdev, 0);

			}

			break;

		case THERMAL_TRIP_PASSIVE:

			if (temp > trip_temp || tz->passive)

			if (temp >= trip_temp || tz->passive)

				thermal_zone_device_passive(tz, temp,

							    trip_temp, count);

			break;