Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

f5e25f0d · Linus Torvalds <[email protected]> · 2015-02-21 11:50:42 -08:00

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

Commit: f5e25f0db07ee6d083d6376c400ca1065a10fa1a
Parents: d34696c2 · 4531fa16

Merge commit. Changes below are compared with the first parent: d34696c2.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/thermal/samsung/exynos_tmu.c	modified	+1	−1	View file

drivers/thermal/samsung/exynos_tmu.c

View file

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index fbeedc0..933cd80 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);