diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 16:52:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-13 16:52:26 -0700 |
| commit | ba2b137d10bafc3cc514e52172b549e64a5402fb (patch) | |
| tree | 1f57795b7555cc19e1453247e5e4bd27aa185a76 /drivers/thermal/thermal_helpers.c | |
| parent | 71893f116109c92e4cd230d990fad5bd7cb4f99d (diff) | |
| parent | b907b408ca64482989cd95dacef804ce509a3673 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management update from Zhang Rui:
- Fix race condition in imx_thermal_probe() (Mikhail Lappo)
- Add cooling device's statistics in sysfs (Viresh Kumar)
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: Add cooling device's statistics in sysfs
thermal: imx: Fix race condition in imx_thermal_probe()
Diffstat (limited to 'drivers/thermal/thermal_helpers.c')
| -rw-r--r-- | drivers/thermal/thermal_helpers.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/thermal/thermal_helpers.c b/drivers/thermal/thermal_helpers.c index 8cdf75adcce1..eb03d7e099bb 100644 --- a/drivers/thermal/thermal_helpers.c +++ b/drivers/thermal/thermal_helpers.c @@ -187,7 +187,10 @@ void thermal_cdev_update(struct thermal_cooling_device *cdev) if (instance->target > target) target = instance->target; } - cdev->ops->set_cur_state(cdev, target); + + if (!cdev->ops->set_cur_state(cdev, target)) + thermal_cooling_device_stats_update(cdev, target); + cdev->updated = true; mutex_unlock(&cdev->lock); trace_cdev_update(cdev, target); |