powercap: intel_rapl: Change an error pointer to NULL

Dan Carpenter · rafaeljw · commit 6b08b4ee5e60 · 2024-08-23T15:45:17.000+02:00
The rapl_find_package_domain_cpuslocked() function is supposed to return NULL on error. This new error patch returns ERR_PTR(-EINVAL) but none of the callers check for that so it would lead to an Oops. Fixes: 26096ae ("powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/fa719c6a-8d3b-4cca-9b43-bcd477ff6655@stanley.mountain Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c
@@ -2157,7 +2157,7 @@ struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_
 		      topology_physical_package_id(id) : topology_logical_die_id(id);
 		if (uid < 0) {
 			pr_err("topology_logical_(package/die)_id() returned a negative value");
-			return ERR_PTR(-EINVAL);
+			return NULL;
 		}
 	}
 	else

Original file line number	Diff line number	Diff line change
`@@ -2157,7 +2157,7 @@ struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_`
`2157`	`2157`	`topology_physical_package_id(id) : topology_logical_die_id(id);`
`2158`	`2158`	`if (uid < 0) {`
`2159`	`2159`	`pr_err("topology_logical_(package/die)_id() returned a negative value");`
`2160`		`- return ERR_PTR(-EINVAL);`
	`2160`	`+ return NULL;`
`2161`	`2161`	`}`
`2162`	`2162`	`}`
`2163`	`2163`	`else`