diff options
| author | Javi Merino <javi.merino@arm.com> | 2014-11-25 16:00:33 +0000 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-08 12:10:44 +0800 |
| commit | b6cc772f64ac7d1917770406844b73a94ca5ef06 (patch) | |
| tree | 91a4036308f97df59865b02f5b941b799ddd1755 /drivers/thermal/thermal_core.c | |
| parent | 84ffe3ecc2c8b3effc41c0babd2cc24f1edb2aab (diff) | |
| download | linux-b6cc772f64ac7d1917770406844b73a94ca5ef06.tar.gz linux-b6cc772f64ac7d1917770406844b73a94ca5ef06.tar.bz2 linux-b6cc772f64ac7d1917770406844b73a94ca5ef06.zip | |
thermal: lock the thermal zone when switching governors
Currently, userspace can request a governor change while the governor
itself is running. Grab the thermal zone lock when changing the
governor to prevent this race.
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal/thermal_core.c')
| -rw-r--r-- | drivers/thermal/thermal_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 5aa57736fa9e..7b723c7c4cae 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -757,6 +757,7 @@ policy_store(struct device *dev, struct device_attribute *attr, snprintf(name, sizeof(name), "%s", buf); mutex_lock(&thermal_governor_lock); + mutex_lock(&tz->lock); gov = __find_governor(strim(name)); if (!gov) @@ -766,6 +767,7 @@ policy_store(struct device *dev, struct device_attribute *attr, ret = count; exit: + mutex_unlock(&tz->lock); mutex_unlock(&thermal_governor_lock); return ret; } |