]> git.ipfire.org Git - people/arne_f/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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Apr 2019 07:15:56 +0000 (09:15 +0200)
commit8fd403fc2a8ef3edf27468075029030d92663d51
tree7b2d1313c7c9313cfa927f7d74936d3b7805607d
parent0644ee713c000e725645cb78647340dbcb4c44c7
thermal: samsung: Fix incorrect check after code merge

[ 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>
drivers/thermal/samsung/exynos_tmu.c