iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thermal: exynos: Propagate error value from tmu_read()

Browse Source 
tmu_read() in case of Exynos4210 might return error for out of bound
values. Current code ignores such value, what leads to reporting critical
temperature value. Add proper error code propagation to exynos_get_temp()
function.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
CC: stable@vger.kernel.org # v4.6+
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Marek Szyprowski 2018-04-16 12:11:53 +02:00 committed by Eduardo Valentin
parent 0eb875d88a
commit 08d725cd93
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/thermal/samsung/exynos_tmu.c
View File

@ -892,6 +892,7 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on)
static int exynos_get_temp(void *p, int *temp) static int exynos_get_temp(void *p, int *temp)
{ {
struct exynos_tmu_data *data = p; struct exynos_tmu_data *data = p;
int value, ret = 0;
if (!data || !data->tmu_read || !data->enabled) if (!data || !data->tmu_read || !data->enabled)
return -EINVAL; return -EINVAL;
@ -899,12 +900,16 @@ static int exynos_get_temp(void *p, int *temp)
mutex_lock(&data->lock); mutex_lock(&data->lock);
clk_enable(data->clk); clk_enable(data->clk);
*temp = code_to_temp(data, data->tmu_read(data)) * MCELSIUS; value = data->tmu_read(data);
if (value < 0)
ret = value;
else
*temp = code_to_temp(data, value) * MCELSIUS;
clk_disable(data->clk); clk_disable(data->clk);
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
return 0; return ret;
} }
#ifdef CONFIG_THERMAL_EMULATION #ifdef CONFIG_THERMAL_EMULATION