aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 11:50:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 11:50:42 -0800
commitf5e25f0db07ee6d083d6376c400ca1065a10fa1a (patch)
tree861a6205ff1ddc4bcac33d2e9170a204d86d9902
parentd34696c2208b2dc1b27ec8f0a017a91e4e6eb85d (diff)
parent4531fa1684bb883ee01f1a182900b1e15d461b34 (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fix from Zhang Rui: "One patch to fix a problem that all Exynos SoCs will break at boot time" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: exynos: fix: Check if data->tmu_read callback is present before read
-rw-r--r--drivers/thermal/samsung/exynos_tmu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index fbeedc072cc2..933cd80a6bc5 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -716,7 +716,7 @@ static int exynos_get_temp(void *p, long *temp)
{
struct exynos_tmu_data *data = p;
- if (!data)
+ if (!data || !data->tmu_read)
return -EINVAL;
mutex_lock(&data->lock);

Privacy Policy