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

Commit b6c10c84 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

PM / Domains: Make failing pm_genpd_prepare() clean up properly 



If pm_generic_prepare() in pm_genpd_prepare() returns error code,
the PM domains counter of "prepared" devices should be decremented
and its suspend_power_off flag should be reset if this counter drops
down to zero.  Otherwise, the PM domain runtime PM code will not
handle the domain correctly (it will permanently think that system
suspend is in progress).

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent 6f00ff78

drivers/base/power/domain.c

+11 −1
Original line number Diff line number Diff line
@@ -367,6 +367,7 @@ static void pm_genpd_sync_poweroff(struct generic_pm_domain *genpd) 
static int pm_genpd_prepare(struct device *dev)

{

	struct generic_pm_domain *genpd;

	int ret;



	dev_dbg(dev, "%s()\n", __func__);
@@ -400,7 +401,16 @@ static int pm_genpd_prepare(struct device *dev) 


	mutex_unlock(&genpd->lock);



	return pm_generic_prepare(dev);

	ret = pm_generic_prepare(dev);

	if (ret) {

		mutex_lock(&genpd->lock);



		if (--genpd->prepared_count == 0)

			genpd->suspend_power_off = false;



		mutex_unlock(&genpd->lock);

	}

	return ret;

}



/**