| Message ID | 20190122154741.31767-1-m.szyprowski@samsung.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] thermal: samsung: Fix incorrect check after code merge | expand |
Hi All, On 2019-01-22 16:47, Marek Szyprowski 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 <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> gentle ping > --- > Changelog: > v2: > - added reviewed-by tag, fixed mail addresses > --- > drivers/thermal/samsung/exynos_tmu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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) > /* Best regards -- Marek Szyprowski, PhD Samsung R&D Institute Poland
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 <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> --- Changelog: v2: - added reviewed-by tag, fixed mail addresses --- drivers/thermal/samsung/exynos_tmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1