← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lts-quantal/precise-updates

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Luis Henriques, Tim Gardner
  • Date: 2013-02-07 12:08:38 UTC
  • Revision ID: package-import@ubuntu.com-20130207120838-8jaukepmb85dkevq
Tags: 3.5.0-24.37~precise1
https://launchpad.net/bugs/1118287
https://launchpad.net/bugs/927782
[Luis Henriques]

* Release Tracking Bug
  - LP: #1118287

[ Tim Gardner ]

* [Config] CONFIG_ALX=m for x86 only
  - LP: #927782

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/base/power/main.c
527
527
        error = dpm_run_callback(callback, dev, state, info);
528
528
 
529
529
        TRACE_RESUME(error);
 
530
 
 
531
        pm_runtime_enable(dev);
530
532
        return error;
531
533
}
532
534
 
602
604
        if (!dev->power.is_suspended)
603
605
                goto Unlock;
604
606
 
605
 
        pm_runtime_enable(dev);
606
607
        put = true;
607
608
 
608
609
        if (dev->pm_domain) {
939
940
        pm_callback_t callback = NULL;
940
941
        char *info = NULL;
941
942
 
 
943
        __pm_runtime_disable(dev, false);
 
944
 
942
945
        if (dev->pm_domain) {
943
946
                info = "late power domain ";
944
947
                callback = pm_late_early_op(&dev->pm_domain->ops, state);
1134
1137
 
1135
1138
 Complete:
1136
1139
        complete_all(&dev->power.completion);
1137
 
 
1138
1140
        if (error) {
1139
1141
                pm_runtime_put_sync(dev);
1140
1142
                async_error = error;
1141
 
        } else if (dev->power.is_suspended) {
1142
 
                __pm_runtime_disable(dev, false);
1143
1143
        }
1144
1144
 
1145
1145
        return error;