summaryrefslogtreecommitdiffstats
path: root/drivers/powercap/dtpm.c
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2021-01-06 09:41:09 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-01-07 18:13:51 +0100
commit0fe1329b7b518f67c8f1760711eb0eaf90433fd3 (patch)
tree84caa9ccdee58a1306207a6315d3d6d4e9417e26 /drivers/powercap/dtpm.c
parentpowercap/drivers/dtpm: Fix a double shift bug (diff)
downloadlinux-0fe1329b7b518f67c8f1760711eb0eaf90433fd3.tar.xz
linux-0fe1329b7b518f67c8f1760711eb0eaf90433fd3.zip
powercap/drivers/dtpm: Fix some missing unlock bugs
We need to unlock on these paths before returning. Fixes: a20d0ef97abf ("powercap/drivers/dtpm: Add API for dynamic thermal power management") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to '')
-rw-r--r--drivers/powercap/dtpm.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c
index d49df0569cd4..470a1182b868 100644
--- a/drivers/powercap/dtpm.c
+++ b/drivers/powercap/dtpm.c
@@ -147,13 +147,17 @@ static void __dtpm_add_power(struct dtpm *dtpm)
*/
int dtpm_update_power(struct dtpm *dtpm, u64 power_min, u64 power_max)
{
+ int ret = 0;
+
mutex_lock(&dtpm_lock);
if (power_min == dtpm->power_min && power_max == dtpm->power_max)
- return 0;
+ goto unlock;
- if (power_max < power_min)
- return -EINVAL;
+ if (power_max < power_min) {
+ ret = -EINVAL;
+ goto unlock;
+ }
__dtpm_sub_power(dtpm);
@@ -164,9 +168,10 @@ int dtpm_update_power(struct dtpm *dtpm, u64 power_min, u64 power_max)
__dtpm_add_power(dtpm);
+unlock:
mutex_unlock(&dtpm_lock);
- return 0;
+ return ret;
}
/**
@@ -187,8 +192,10 @@ int dtpm_release_zone(struct powercap_zone *pcz)
mutex_lock(&dtpm_lock);
- if (!list_empty(&dtpm->children))
+ if (!list_empty(&dtpm->children)) {
+ mutex_unlock(&dtpm_lock);
return -EBUSY;
+ }
if (parent)
list_del(&dtpm->sibling);