]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 2 Jul 2019 10:07:53 +0000 (12:07 +0200)
commit309ab540bfedf15a69ca32a7dabca450db0eabd4
tree70362f8e82e5772542bec6c6773a7f818f0113ce
parentb3f070fd0d171760c6d5aad64373a48b9fe57af0
thermal: samsung: Fix incorrect check after code merge

BugLink: https://bugs.launchpad.net/bugs/1830906
[ Upstream commit 3b5236cc5d086dd3ddd01113ee9255421aab9fab ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/thermal/samsung/exynos_tmu.c