thermal: samsung: Fix incorrect check after code merge
authorMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 22 Jan 2019 15:47:41 +0000 (16:47 +0100)
committerZhang Rui <rui.zhang@intel.com>
Mon, 18 Mar 2019 14:11:06 +0000 (22:11 +0800)
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>
drivers/thermal/samsung/exynos_tmu.c

index 48eef552cba48edb5d60f7a75b715f9536e1b5ae..fc9399d9c0820d59a4321520fd5dcf9242620867 100644 (file)
@@ -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)
                /*