diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-08-19 02:28:42 -0400 |
---|---|---|
committer | Eduardo Valentin <eduardo.valentin@ti.com> | 2013-08-29 09:37:28 -0400 |
commit | 91ff81cf48f0c8f9cd608acbd83f0e98a228807b (patch) | |
tree | 5653e70fbece51a7f2bd8e50dd1c11ab204a4ff3 /drivers/thermal/samsung/exynos_thermal_common.c | |
parent | 02ae59dc0e49b1db6e57435553fb7d4f68732688 (diff) |
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/samsung/exynos_thermal_common.c')
-rw-r--r-- | drivers/thermal/samsung/exynos_thermal_common.c | 6 |
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, | |||
53 | { | 53 | { |
54 | struct exynos_thermal_zone *th_zone = thermal->devdata; | 54 | struct exynos_thermal_zone *th_zone = thermal->devdata; |
55 | if (!th_zone) { | 55 | if (!th_zone) { |
56 | dev_err(th_zone->sensor_conf->dev, | 56 | dev_err(&thermal->device, |
57 | "thermal zone not registered\n"); | 57 | "thermal zone not registered\n"); |
58 | return 0; | 58 | return 0; |
59 | } | 59 | } |
@@ -231,7 +231,7 @@ static int exynos_get_temp(struct thermal_zone_device *thermal, | |||
231 | void *data; | 231 | void *data; |
232 | 232 | ||
233 | if (!th_zone->sensor_conf) { | 233 | if (!th_zone->sensor_conf) { |
234 | dev_err(th_zone->sensor_conf->dev, | 234 | dev_err(&thermal->device, |
235 | "Temperature sensor not initialised\n"); | 235 | "Temperature sensor not initialised\n"); |
236 | return -EINVAL; | 236 | return -EINVAL; |
237 | } | 237 | } |
@@ -251,7 +251,7 @@ static int exynos_set_emul_temp(struct thermal_zone_device *thermal, | |||
251 | struct exynos_thermal_zone *th_zone = thermal->devdata; | 251 | struct exynos_thermal_zone *th_zone = thermal->devdata; |
252 | 252 | ||
253 | if (!th_zone->sensor_conf) { | 253 | if (!th_zone->sensor_conf) { |
254 | dev_err(th_zone->sensor_conf->dev, | 254 | dev_err(&thermal->device, |
255 | "Temperature sensor not initialised\n"); | 255 | "Temperature sensor not initialised\n"); |
256 | return -EINVAL; | 256 | return -EINVAL; |
257 | } | 257 | } |