From: Dan Carpenter <dan.carpenter@oracle.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Cristian Marussi <cristian.marussi@arm.com>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/2] powercap: arm_scmi: Fix a NULL vs IS_ERR() bug
Date: Wed, 6 Jul 2022 17:27:28 +0300 [thread overview]
Message-ID: <YsWb0JLVFbXS+qGj@kili> (raw)
In-Reply-To: <YsWbsKolf4UFeEYz@kili>
The powercap_register_control_type() return error pointers. It never
returns NULL.
Fixes: 31afdd34f2b9 ("powercap: arm_scmi: Add SCMI powercap based driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
This functions should really clean up after itself if scmi_register()
fails. I need to fix the static checker for that and then I'll come
back and fix it if no one else does.
drivers/powercap/arm_scmi_powercap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/powercap/arm_scmi_powercap.c b/drivers/powercap/arm_scmi_powercap.c
index ab96cf9a8604..2d505ec7ff81 100644
--- a/drivers/powercap/arm_scmi_powercap.c
+++ b/drivers/powercap/arm_scmi_powercap.c
@@ -519,8 +519,8 @@ static struct scmi_driver scmi_powercap_driver = {
static int __init scmi_powercap_init(void)
{
scmi_top_pcntrl = powercap_register_control_type(NULL, "arm-scmi", NULL);
- if (!scmi_top_pcntrl)
- return -ENODEV;
+ if (IS_ERR(scmi_top_pcntrl))
+ return PTR_ERR(scmi_top_pcntrl);
return scmi_register(&scmi_powercap_driver);
}
--
2.35.1
next prev parent reply other threads:[~2022-07-06 14:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 14:26 [PATCH 1/2] powercap: arm_scmi: Fix signedness bug in probe Dan Carpenter
2022-07-06 14:27 ` Dan Carpenter [this message]
2022-07-06 15:20 ` [PATCH 2/2] powercap: arm_scmi: Fix a NULL vs IS_ERR() bug Cristian Marussi
2022-07-06 15:32 ` Dan Carpenter
2022-07-06 15:46 ` Cristian Marussi
2022-07-06 14:52 ` [PATCH 1/2] powercap: arm_scmi: Fix signedness bug in probe Cristian Marussi
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=YsWb0JLVFbXS+qGj@kili \
--to=dan.carpenter@oracle.com \
--cc=cristian.marussi@arm.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=sudeep.holla@arm.com \
/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