PM / Domains: Check domain status during hibernation restore of devices

Power domains that were off before hibernation shouldn't be turned on during device restore, so prevent that from happening. This change fixes up commit 65533bb PM / Domains: Fix hibernation restore of devices, v2 that didn't include it by mistake. Signed-off-by: Rafael J. Wysocki <[email protected]>
cm12-amami · Mar 19, 2012 · 18dd2ec · 18dd2ec
1 parent 57d1337
commit 18dd2ec
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
@@ -1127,6 +1127,9 @@ static int pm_genpd_restore_noirq(struct device *dev)
 		}
 	}
 
+	if (genpd->suspend_power_off)
+		return 0;
+
 	pm_genpd_poweron(genpd);
 
 	return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);