Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarJacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent bed5ab63

drivers/powercap/intel_rapl.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {

		INIT_LIST_HEAD(&rp->plist);

		list_add(&rp->plist, &rapl_packages);

		return ret;

		return 0;

	}



err_free_package: