Commit 8fd403fc authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Greg Kroah-Hartman

thermal: samsung: Fix incorrect check after code merge

[ Upstream commit 3b5236cc ]

Merge commit 19785cf9 ("Merge branch 'linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal")
broke the code introduced by commit ffe6e16f ("thermal: exynos: Reduce
severity of too early temperature read"). Restore the original code from
the mentioned commit to finally fix the warning message during boot:

thermal thermal_zone0: failed to read out thermal zone (-22)
Reported-by: default avatarMarian Mihailescu <mihailescu2m@gmail.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Fixes: 19785cf9 ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal")
Reviewed-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0644ee71
...@@ -666,7 +666,7 @@ static int exynos_get_temp(void *p, int *temp) ...@@ -666,7 +666,7 @@ static int exynos_get_temp(void *p, int *temp)
struct exynos_tmu_data *data = p; struct exynos_tmu_data *data = p;
int value, ret = 0; int value, ret = 0;
if (!data || !data->tmu_read || !data->enabled) if (!data || !data->tmu_read)
return -EINVAL; return -EINVAL;
else if (!data->enabled) else if (!data->enabled)
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment