summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-08-19 11:58:42 +0530
committerEduardo Valentin <eduardo.valentin@ti.com>2013-08-29 09:37:28 -0400
commit91ff81cf48f0c8f9cd608acbd83f0e98a228807b (patch)
tree5653e70fbece51a7f2bd8e50dd1c11ab204a4ff3 /drivers/thermal
parent02ae59dc0e49b1db6e57435553fb7d4f68732688 (diff)
downloadlinux-stable-91ff81cf48f0c8f9cd608acbd83f0e98a228807b.tar.gz
linux-stable-91ff81cf48f0c8f9cd608acbd83f0e98a228807b.tar.bz2
linux-stable-91ff81cf48f0c8f9cd608acbd83f0e98a228807b.zip
thermal: exynos: Fix potential NULL pointer dereference
NULL pointer was being dereferenced in its own error message. Changed it to the correct device pointer. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/samsung/exynos_thermal_common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c
index 4d8e4445ea10..f10a6ad37c06 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.c
+++ b/drivers/thermal/samsung/exynos_thermal_common.c
@@ -53,7 +53,7 @@ static int exynos_set_mode(struct thermal_zone_device *thermal,
{
struct exynos_thermal_zone *th_zone = thermal->devdata;
if (!th_zone) {
- dev_err(th_zone->sensor_conf->dev,
+ dev_err(&thermal->device,
"thermal zone not registered\n");
return 0;
}
@@ -231,7 +231,7 @@ static int exynos_get_temp(struct thermal_zone_device *thermal,
void *data;
if (!th_zone->sensor_conf) {
- dev_err(th_zone->sensor_conf->dev,
+ dev_err(&thermal->device,
"Temperature sensor not initialised\n");
return -EINVAL;
}
@@ -251,7 +251,7 @@ static int exynos_set_emul_temp(struct thermal_zone_device *thermal,
struct exynos_thermal_zone *th_zone = thermal->devdata;
if (!th_zone->sensor_conf) {
- dev_err(th_zone->sensor_conf->dev,
+ dev_err(&thermal->device,
"Temperature sensor not initialised\n");
return -EINVAL;
}