summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorKeerthy <j-keerthy@ti.com>2016-06-02 14:24:50 +0530
committerZhang Rui <rui.zhang@intel.com>2016-09-27 14:02:16 +0800
commite2fa74880987e9d6e3f8dcbff3f3eb260936842f (patch)
treedf5780baff706bd3072b156ec4a793f1676f4a4c /drivers/thermal
parent1f09ba82fa4bd405f5c656c48d53e076931b4a2d (diff)
downloadop-kernel-dev-e2fa74880987e9d6e3f8dcbff3f3eb260936842f.zip
op-kernel-dev-e2fa74880987e9d6e3f8dcbff3f3eb260936842f.tar.gz
thermal: of-thermal: Fix setting of set_emul_temp hook
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>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/of-thermal.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
index 20822ab..972b0cf 100644
--- a/drivers/thermal/of-thermal.c
+++ b/drivers/thermal/of-thermal.c
@@ -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);
}
@@ -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;
OpenPOWER on IntegriCloud