Browse Source

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 65533bbf63b4f37723fdfedc73d0653958973323

    PM / Domains: Fix hibernation restore of devices, v2

that didn't include it by mistake.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Rafael J. Wysocki 13 years ago
parent
commit
18dd2ece3c
1 changed files with 3 additions and 0 deletions
  1. 3 0
      drivers/base/power/domain.c

+ 3 - 0
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);
 	pm_genpd_poweron(genpd);
 
 
 	return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);
 	return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);