diff options
| author |   Marek Szyprowski <m.szyprowski@samsung.com> | 2019-01-22 16:47:41 +0100 |
|---|---|---|
| committer |   Zhang Rui <rui.zhang@intel.com> | 2019-03-18 22:11:06 +0800 |
| commit | 3b5236cc5d086dd3ddd01113ee9255421aab9fab (patch) | |
| tree | 09d3cdacd27c7268ad3f82a764f0ea1c390cf429 /drivers/thermal/samsung/exynos_tmu.c | |
| parent | thermal/intel_powerclamp: fix __percpu declaration of worker_data (diff) | |
| download | linux-dev-3b5236cc5d086dd3ddd01113ee9255421aab9fab.tar.xz linux-dev-3b5236cc5d086dd3ddd01113ee9255421aab9fab.zip | |
thermal: samsung: Fix incorrect check after code merge
Merge commit 19785cf93b6c ("Merge branch 'linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal")
broke the code introduced by commit ffe6e16f14fa ("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: Marian Mihailescu <mihailescu2m@gmail.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Fixes: 19785cf93b6c ("Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal")
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal/samsung/exynos_tmu.c')
| -rw-r--r-- | drivers/thermal/samsung/exynos_tmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 48eef552cba4..fc9399d9c082 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -666,7 +666,7 @@ static int exynos_get_temp(void *p, int *temp) struct exynos_tmu_data *data = p; int value, ret = 0; - if (!data || !data->tmu_read || !data->enabled) + if (!data || !data->tmu_read) return -EINVAL; else if (!data->enabled) /* |