Commit a74f4367 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Rafael J. Wysocki

powercap/intel_rapl: Propagate error code when registration fails

If rapl_package_register_powercap() fails in rapl_add_package() the
function happily returns 0.

Capture the error code and propagate it.
Signed-off-by: 's avatarThomas Gleixner <>
Tested-by: 's avatarJacob Pan <>
Signed-off-by: 's avatarRafael J. Wysocki <>
parent bed5ab63
......@@ -1563,9 +1563,8 @@ static void rapl_remove_package(struct rapl_package *rp)
/* called from CPU hotplug notifier, hotplug lock held */
static int rapl_add_package(int cpu)
int ret = 0;
int phy_package_id;
struct rapl_package *rp;
int ret, phy_package_id;
phy_package_id = topology_physical_package_id(cpu);
rp = kzalloc(sizeof(struct rapl_package), GFP_KERNEL);
......@@ -1583,10 +1582,11 @@ static int rapl_add_package(int cpu)
ret = -ENODEV;
goto err_free_package;
if (!rapl_package_register_powercap(rp)) {
ret = rapl_package_register_powercap(rp);
if (!ret) {
list_add(&rp->plist, &rapl_packages);
return ret;
return 0;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment