diff options
| author | Thara Gopinath <thara.gopinath@linaro.org> | 2018-11-27 17:43:11 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-12 19:47:03 +0100 |
| commit | 9c74cd4afbd3b5b6d90366b7dcb2a7befa8a37f2 (patch) | |
| tree | 715da2fb9fc3c02ac9d8c8a93efc5d3db237458d /drivers/thermal | |
| parent | f8a33ec5367e41e7a7641c5c75255d1355581e05 (diff) | |
| download | linux-stable-9c74cd4afbd3b5b6d90366b7dcb2a7befa8a37f2.tar.gz linux-stable-9c74cd4afbd3b5b6d90366b7dcb2a7befa8a37f2.tar.bz2 linux-stable-9c74cd4afbd3b5b6d90366b7dcb2a7befa8a37f2.zip | |
thermal: Fix locking in cooling device sysfs update cur_state
[ Upstream commit 68000a0d983f539c95ebe5dccd4f29535c7ac0af ]
Sysfs interface to update cooling device cur_state does not
currently holding cooling device lock sometimes leading to
stale values in cur_state if getting updated simultanelously
from user space and thermal framework. Adding the proper locking
code fixes this issue.
Signed-off-by: Thara Gopinath <thara.gopinath@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/thermal_sysfs.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c index 2241ceae7d7f..aa99edb4dff7 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c @@ -712,11 +712,14 @@ cur_state_store(struct device *dev, struct device_attribute *attr, if ((long)state < 0) return -EINVAL; + mutex_lock(&cdev->lock); + result = cdev->ops->set_cur_state(cdev, state); - if (result) - return result; - thermal_cooling_device_stats_update(cdev, state); - return count; + if (!result) + thermal_cooling_device_stats_update(cdev, state); + + mutex_unlock(&cdev->lock); + return result ? result : count; } static struct device_attribute |