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

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
2 parents d34696c220 4531fa1684
Showing 1 changed file Side-by-side Diff
drivers/thermal/samsung/exynos_tmu.c
@@ -716,7 +716,7 @@
 {
 	struct exynos_tmu_data *data = p;
  
-	if (!data)
+	if (!data || !data->tmu_read)
 		return -EINVAL;
  
 	mutex_lock(&data->lock);
...	...	@@ -716,7 +716,7 @@
716	716	{
717	717	struct exynos_tmu_data *data = p;
718	718
719		- if (!data)
	719	+ if (!data \|\| !data->tmu_read)
720	720	return -EINVAL;
721	721
722	722	mutex_lock(&data->lock);