| Message ID | 20190122131847.7508-1-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | thermal: samsung: Fix incorrect check after code merge | expand |
On Tue, 22 Jan 2019 at 14:18, Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > 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 <marian.mihailescu@adelaide.edu.au> > 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") > --- > drivers/thermal/samsung/exynos_tmu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Damn... Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof
Can you please use my gmail email address if it’s not too late? :) mihailescu2m@gmail.com Thanks, Marian > On 23 Jan 2019, at 12:41 am, Krzysztof Kozlowski <krzk@kernel.org> wrote: > >> On Tue, 22 Jan 2019 at 14:18, Marek Szyprowski <m.szyprowski@samsung.com> wrote: >> >> 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 <marian.mihailescu@adelaide.edu.au> >> 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") >> --- >> drivers/thermal/samsung/exynos_tmu.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Damn... > Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> > > Best regards, > Krzysztof
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) /*
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 <marian.mihailescu@adelaide.edu.au> 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") --- drivers/thermal/samsung/exynos_tmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)