From e25454ef97d8beabbb18104a54f7ee2be2dd4cf9 Mon Sep 17 00:00:00 2001 From: Irina Tirdea Date: Tue, 28 Feb 2017 17:51:05 +0200 Subject: [PATCH] MLK-14291 thermal: imx: fix setting passive trip temp When setting passive temperature trip point, it is not allowed to set a higher value than the default. Currently the driver compares the new temperature to set with a constant (0). This comparison wil always be true (temp to set higher than 0) and the driver will return -EINVAL. This is a leftover from rebasing the commit fc4fcd689419 ("MLK-11705 thermal: imx: make the critical trip temp changable for test"). Fix the comparison by using the actual default passive temperature value instead of the wrong constant. Signed-off-by: Irina Tirdea --- drivers/thermal/imx_thermal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 4896244d9f5d..1e37ffc275c9 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -461,7 +461,7 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip, } if (trip == IMX_TRIP_PASSIVE) { - if (temp > IMX_TRIP_PASSIVE) + if (temp > (data->temp_max - (1000 * 10))) return -EINVAL; data->temp_passive = temp; imx_set_alarm_temp(data, temp); -- 2.17.1