[PATCH v2 3/3] powercap: arm_scmi: Fix a NULL vs IS_ERR() bug

Cristian Marussi cristian.marussi at arm.com
Tue Sep 6 07:23:37 PDT 2022


From: Dan Carpenter <dan.carpenter at oracle.com>

The powercap_register_control_type() return error pointers.  It never
returns NULL.

Signed-off-by: Dan Carpenter <dan.carpenter at oracle.com>
---
 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 76200c004cad..05d0e516176a 100644
--- a/drivers/powercap/arm_scmi_powercap.c
+++ b/drivers/powercap/arm_scmi_powercap.c
@@ -485,8 +485,8 @@ static int __init scmi_powercap_init(void)
 	int ret;
 
 	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);
 
 	ret = scmi_register(&scmi_powercap_driver);
 	if (ret)
-- 
2.32.0




More information about the linux-arm-kernel mailing list