aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThara Gopinath <thara.gopinath@linaro.org>2018-11-27 17:43:11 -0500
committerZhang Rui <rui.zhang@intel.com>2018-11-30 03:57:51 -0500
commit68000a0d983f539c95ebe5dccd4f29535c7ac0af (patch)
treee0d573af5721a3ac9a10943bc09ce1a2a982ccef
parent964f4843a455d2ffb199512b08be8d5f077c4cac (diff)
thermal: Fix locking in cooling device sysfs update cur_state
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>
-rw-r--r--drivers/thermal/thermal_sysfs.c11
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,
712 if ((long)state < 0) 712 if ((long)state < 0)
713 return -EINVAL; 713 return -EINVAL;
714 714
715 mutex_lock(&cdev->lock);
716
715 result = cdev->ops->set_cur_state(cdev, state); 717 result = cdev->ops->set_cur_state(cdev, state);
716 if (result) 718 if (!result)
717 return result; 719 thermal_cooling_device_stats_update(cdev, state);
718 thermal_cooling_device_stats_update(cdev, state); 720
719 return count; 721 mutex_unlock(&cdev->lock);
722 return result ? result : count;
720} 723}
721 724
722static struct device_attribute 725static struct device_attribute