Skip to content

Commit

Permalink
Merge branch 'pm-domains'
Browse files Browse the repository at this point in the history
* pm-domains:
  PM / Domains: Check domain status during hibernation restore of devices
  • Loading branch information
Rafael J. Wysocki committed Mar 19, 2012
2 parents 0f0cc16 + 18dd2ec commit 98e8bda
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/base/power/domain.c
Original file line number Diff line number Diff line change
@@ -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);

0 comments on commit 98e8bda

Please sign in to comment.