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

Commit e7fb60a3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "thermal: tsens2xxx: Update trip activation" into msm-4.9

parents f2745c6e f10a5a3d

drivers/thermal/tsens2xxx.c

+18 −2
Original line number Diff line number Diff line
@@ -257,7 +257,15 @@ static int tsens2xxx_set_trip_temp(struct tsens_sensor *tm_sensor, 
				THERMAL_TRIP_CONFIGURABLE_HI,

				THERMAL_TRIP_ACTIVATION_ENABLED);

		if (rc) {

			pr_err("Error during trip high activation :%d\n", rc);

			pr_err("trip high enable error :%d\n", rc);

			goto fail;

		}

	} else {

		rc = tsens_tm_activate_trip_type(tm_sensor,

				THERMAL_TRIP_CONFIGURABLE_HI,

				THERMAL_TRIP_ACTIVATION_DISABLED);

		if (rc) {

			pr_err("trip high disable error :%d\n", rc);

			goto fail;

		}

	}
@@ -267,7 +275,15 @@ static int tsens2xxx_set_trip_temp(struct tsens_sensor *tm_sensor, 
				THERMAL_TRIP_CONFIGURABLE_LOW,

				THERMAL_TRIP_ACTIVATION_ENABLED);

		if (rc) {

			pr_err("Error during trip low activation :%d\n", rc);

			pr_err("trip low enable activation error :%d\n", rc);

			goto fail;

		}

	} else {

		rc = tsens_tm_activate_trip_type(tm_sensor,

				THERMAL_TRIP_CONFIGURABLE_LOW,

				THERMAL_TRIP_ACTIVATION_DISABLED);

		if (rc) {

			pr_err("trip low disable error :%d\n", rc);

			goto fail;

		}

	}