Explorar o código

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
Linus Torvalds %!s(int64=10) %!d(string=hai) anos
pai
achega
f5e25f0db0
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      drivers/thermal/samsung/exynos_tmu.c

+ 1 - 1
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);