diff options
| author | Irina Tirdea <irina.tirdea@nxp.com> | 2017-02-28 17:51:05 +0200 |
|---|---|---|
| committer | Anson Huang <Anson.Huang@nxp.com> | 2017-06-08 21:00:27 +0800 |
| commit | 82a0ac4444543385c5ea678184e135d1ce1caef1 (patch) | |
| tree | 7e0e23d963ac4a1df00484234355d7b412c0807b /drivers/thermal | |
| parent | 898071c39913a4b70bc0fb3a92e2a13291f1bc0b (diff) | |
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 <irina.tirdea@nxp.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/imx_thermal.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |