Skip to content

Commit

Permalink
thermal: of-thermal: Fix setting of set_emul_temp hook
Browse files Browse the repository at this point in the history
Currently thermal zone set_emul_temp is set unconditionally
with of_thermal_set_emul_temp function. Set this only if the
set_emul_temp hook is provided for thermal_zone_of_device_ops.

This fixes emul_temp failures on platforms for which set_emul_temp
hook is not populated.

Fixes: "184a4bf623f (thermal: of: Extend current
	of-thermal.c code to allow setting emulated temp)"
Suggested-by: Eduardo Valentin <edubezval@gmail.com>
Signed-off-by: Keerthy <j-keerthy@ti.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>

Conflicts:
	drivers/thermal/of-thermal.c
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
  • Loading branch information
Keerthy authored and Zhang Rui committed Sep 27, 2016
1 parent 1f09ba8 commit e2fa748
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions drivers/thermal/of-thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,9 +192,6 @@ static int of_thermal_set_emul_temp(struct thermal_zone_device *tz,
{
struct __thermal_zone *data = tz->devdata;

if (!data->ops || !data->ops->set_emul_temp)
return -EINVAL;

return data->ops->set_emul_temp(data->sensor_data, temp);
}

Expand Down Expand Up @@ -432,7 +429,9 @@ thermal_zone_of_add_sensor(struct device_node *zone,
if (ops->set_trips)
tzd->ops->set_trips = of_thermal_set_trips;

tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
if (ops->set_emul_temp)
tzd->ops->set_emul_temp = of_thermal_set_emul_temp;

mutex_unlock(&tzd->lock);

return tzd;
Expand Down

0 comments on commit e2fa748

Please sign in to comment.