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

Commit 29e47e21 authored by Ulf Hansson's avatar Ulf Hansson Committed by Rafael J. Wysocki
Browse files

PM / Domains: Try power off masters in error path of __pm_genpd_poweron() 



While powering up a genpd, its domain masters are first being powered up.
In the error path of __pm_genpd_poweron(), we didn't care to try power off
these domain masters. Let's deal with that to avoid leaving unused PM
domains powered.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 8bb6944e

drivers/base/power/domain.c

+17 −13
Original line number Diff line number Diff line
@@ -212,6 +212,18 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool timed) 
	return ret;

}



/**

 * genpd_queue_power_off_work - Queue up the execution of pm_genpd_poweroff().

 * @genpd: PM domait to power off.

 *

 * Queue up the execution of pm_genpd_poweroff() unless it's already been done

 * before.

 */

static void genpd_queue_power_off_work(struct generic_pm_domain *genpd)

{

	queue_work(pm_wq, &genpd->power_off_work);

}



/**

 * __pm_genpd_poweron - Restore power to a given PM domain and its masters.

 * @genpd: PM domain to power up.
@@ -259,8 +271,12 @@ static int __pm_genpd_poweron(struct generic_pm_domain *genpd) 
	return 0;



 err:

	list_for_each_entry_continue_reverse(link, &genpd->slave_links, slave_node)

	list_for_each_entry_continue_reverse(link,

					&genpd->slave_links,

					slave_node) {

		genpd_sd_counter_dec(link->master);

		genpd_queue_power_off_work(link->master);

	}



	return ret;

}
@@ -348,18 +364,6 @@ static int genpd_dev_pm_qos_notifier(struct notifier_block *nb, 
	return NOTIFY_DONE;

}



/**

 * genpd_queue_power_off_work - Queue up the execution of pm_genpd_poweroff().

 * @genpd: PM domait to power off.

 *

 * Queue up the execution of pm_genpd_poweroff() unless it's already been done

 * before.

 */

static void genpd_queue_power_off_work(struct generic_pm_domain *genpd)

{

	queue_work(pm_wq, &genpd->power_off_work);

}



/**

 * pm_genpd_poweroff - Remove power from a given PM domain.

 * @genpd: PM domain to power down.