Merge branch 'pm-domains'

rjwysocki · rjwysocki · commit 98e8bdafeb47 · 2012-03-19T10:39:04.000+01:00
* pm-domains:
  PM / Domains: Check domain status during hibernation restore of devices
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);

Original file line number	Diff line number	Diff line change
`@@ -1127,6 +1127,9 @@ static int pm_genpd_restore_noirq(struct device *dev)`
`1127`	`1127`	`}`
`1128`	`1128`	`}`
`1129`	`1129`
	`1130`	`+ if (genpd->suspend_power_off)`
	`1131`	`+ return 0;`
	`1132`	`+`
`1130`	`1133`	`pm_genpd_poweron(genpd);`
`1131`	`1134`
`1132`	`1135`	`return dev_gpd_data(dev)->always_on ? 0 : genpd_start_dev(genpd, dev);`