← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lowlatency/precise-proposed

« back to all changes in this revision

Viewing changes to drivers/base/power/domain.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-04-04 18:49:36 UTC
  • Revision ID: package-import@ubuntu.com-20120404184936-tqu735914muv4wpg
Tags: 3.2.0-22.30
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-22.35

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-22.35

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/base/power/domain.c
751
751
        if (IS_ERR(genpd))
752
752
                return -EINVAL;
753
753
 
754
 
        if (genpd->suspend_power_off)
 
754
        if (genpd->suspend_power_off
 
755
            || (dev->power.wakeup_path && genpd_dev_active_wakeup(genpd, dev)))
755
756
                return 0;
756
757
 
757
758
        /*