From fd2c659694fc2195914224cc9702e16df24e50bc Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 6 Jan 2021 12:03:08 +0300 Subject: [PATCH] UPSTREAM: powercap/drivers/dtpm: Fix an IS_ERR() vs NULL check The powercap_register_control_type() function never returns NULL, it returns error pointers on error so update this check. Fixes: a20d0ef97abf ("powercap/drivers/dtpm: Add API for dynamic thermal power management") Signed-off-by: Dan Carpenter Acked-by: Daniel Lezcano Signed-off-by: Rafael J. Wysocki Link: https://www.spinics.net/lists/linux-kernel-janitors/msg56987.html Bug: 182396925 Change-Id: Ica228174817bbaa5819778ef55f56e7177e51e94 (cherry picked from commit f8f706ad75abbc65fee365853e7b24731223fd6d) Signed-off-by: Ram Chandrasekar --- drivers/powercap/dtpm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/powercap/dtpm.c b/drivers/powercap/dtpm.c index 470a1182b868..5a51cd34a7e8 100644 --- a/drivers/powercap/dtpm.c +++ b/drivers/powercap/dtpm.c @@ -467,9 +467,9 @@ static int __init dtpm_init(void) struct dtpm_descr **dtpm_descr; pct = powercap_register_control_type(NULL, "dtpm", NULL); - if (!pct) { + if (IS_ERR(pct)) { pr_err("Failed to register control type\n"); - return -EINVAL; + return PTR_ERR(pct); } for_each_dtpm_table(dtpm_descr)