xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: powercap/drivers/dtpm: Fix some missing unlock bugs

Browse Source 
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>

Link: https://www.spinics.net/lists/linux-kernel-janitors/msg57004.html
Bug: 182396925
Change-Id: Idc13f42fc1c74e6b923edeabeacd9a782ef77e11
(cherry picked from commit 0fe1329b7b518f67c8f1760711eb0eaf90433fd3)
Signed-off-by: Ram Chandrasekar <quic_rkumbako@quicinc.com>
This commit is contained in:
Dan Carpenter
2021-01-06 11:41:09 +03:00
committed by Greg Kroah-Hartman
parent 7112d4320f
commit 2a1cd71862
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/powercap/dtpm.c
View File

@@ -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 dtpm_update_power(struct dtpm *dtpm, u64 power_min, u64 power_max)
{ {
int ret = 0;
mutex_lock(&dtpm_lock); mutex_lock(&dtpm_lock);
if (power_min == dtpm->power_min && power_max == dtpm->power_max) if (power_min == dtpm->power_min && power_max == dtpm->power_max)
return 0; goto unlock;
if (power_max < power_min) if (power_max < power_min) {
return -EINVAL; ret = -EINVAL;
goto unlock;
}
__dtpm_sub_power(dtpm); __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); __dtpm_add_power(dtpm);
unlock:
mutex_unlock(&dtpm_lock); mutex_unlock(&dtpm_lock);
return 0; return ret;
} }
/** /**
@@ -187,8 +192,10 @@ int dtpm_release_zone(struct powercap_zone *pcz)
mutex_lock(&dtpm_lock); mutex_lock(&dtpm_lock);
if (!list_empty(&dtpm->children)) if (!list_empty(&dtpm->children)) {
mutex_unlock(&dtpm_lock);
return -EBUSY; return -EBUSY;
}
if (parent) if (parent)
list_del(&dtpm->sibling); list_del(&dtpm->sibling);