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

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index fbeedc072cc2eb1ec8c84003d90997fdceabe989..933cd80a6bc5693e23da36048461bfd6250ba40b 100644 (file)
--- 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);