From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Lukasz Luba <lukasz.luba@arm.com>,
linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/3] powercap/drivers/dtpm: Fix some missing unlock bugs
Date: Wed, 6 Jan 2021 11:41:09 +0300 [thread overview]
Message-ID: <X/V3pV//ui0rcxbs@mwanda> (raw)
In-Reply-To: <X/V2k8dwaXJH6VFh@mwanda>
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>
---
drivers/powercap/dtpm.c | 17 ++++++++++++-----
1 file 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);
--
2.29.2
next prev parent reply other threads:[~2021-01-06 8:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 8:36 [PATCH 1/3] powercap/drivers/dtpm: Fix a double shift bug Dan Carpenter
2021-01-06 8:41 ` Dan Carpenter [this message]
2021-01-07 17:01 ` [PATCH 2/3] powercap/drivers/dtpm: Fix some missing unlock bugs Daniel Lezcano
2021-01-06 9:03 ` [PATCH 3/3] powercap/drivers/dtpm: Fix an IS_ERR() vs NULL check Dan Carpenter
2021-01-07 17:03 ` Daniel Lezcano
2021-01-07 17:19 ` Rafael J. Wysocki
2021-01-07 16:59 ` [PATCH 1/3] powercap/drivers/dtpm: Fix a double shift bug Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=X/V3pV//ui0rcxbs@mwanda \
--to=dan.carpenter@oracle.com \
--cc=daniel.lezcano@linaro.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).