diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2018-05-11 03:37:21 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2018-05-11 03:37:21 +0200 |
| commit | 60abce9f43d812dfec6687a10ca30be380f6f97a (patch) | |
| tree | 3a8dcb27b32be11454d14718991ad1d4c46a48d0 /drivers | |
| parent | thermal: int3403_thermal: Fix NULL pointer deref on module load / probe (diff) | |
| parent | thermal: exynos: Propagate error value from tmu_read() (diff) | |
| download | linux-60abce9f43d812dfec6687a10ca30be380f6f97a.tar.xz linux-60abce9f43d812dfec6687a10ca30be380f6f97a.zip | |
Merge branch 'thermal-soc' into next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/samsung/exynos_tmu.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index ed805c7c5ace..ac83f721db24 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -185,6 +185,7 @@ * @regulator: pointer to the TMU regulator structure. * @reg_conf: pointer to structure to register with core thermal. * @ntrip: number of supported trip points. + * @enabled: current status of TMU device * @tmu_initialize: SoC specific TMU initialization method * @tmu_control: SoC specific TMU control method * @tmu_read: SoC specific TMU temperature read method @@ -205,6 +206,7 @@ struct exynos_tmu_data { struct regulator *regulator; struct thermal_zone_device *tzd; unsigned int ntrip; + bool enabled; int (*tmu_initialize)(struct platform_device *pdev); void (*tmu_control)(struct platform_device *pdev, bool on); @@ -398,6 +400,7 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on) mutex_lock(&data->lock); clk_enable(data->clk); data->tmu_control(pdev, on); + data->enabled = on; clk_disable(data->clk); mutex_unlock(&data->lock); } @@ -889,19 +892,24 @@ static void exynos7_tmu_control(struct platform_device *pdev, bool on) static int exynos_get_temp(void *p, int *temp) { struct exynos_tmu_data *data = p; + int value, ret = 0; - if (!data || !data->tmu_read) + if (!data || !data->tmu_read || !data->enabled) return -EINVAL; mutex_lock(&data->lock); 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); mutex_unlock(&data->lock); - return 0; + return ret; } #ifdef CONFIG_THERMAL_EMULATION |