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 <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/msg56987.html Bug: 182396925 Change-Id: Ica228174817bbaa5819778ef55f56e7177e51e94 (cherry picked from commit f8f706ad75abbc65fee365853e7b24731223fd6d) Signed-off-by: Ram Chandrasekar <quic_rkumbako@quicinc.com>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
2a1cd71862
commit
fd2c659694
@@ -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)
|
||||
|
Reference in New Issue
Block a user