diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:00 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:32 -0400 |
| commit | c88739b373e4930ed082a607cb78bf82616fd076 (patch) | |
| tree | 251d969aa816dab5a62e6b36208b189b37de6534 /drivers/base | |
| parent | 3211af1119174fbe8b676422b74870cdd51d7314 (diff) | |
| parent | 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 (diff) | |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 5419a49ff135..276d5a701dc3 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -59,6 +59,7 @@ void device_pm_init(struct device *dev) | |||
| 59 | { | 59 | { |
| 60 | dev->power.status = DPM_ON; | 60 | dev->power.status = DPM_ON; |
| 61 | init_completion(&dev->power.completion); | 61 | init_completion(&dev->power.completion); |
| 62 | complete_all(&dev->power.completion); | ||
| 62 | dev->power.wakeup_count = 0; | 63 | dev->power.wakeup_count = 0; |
| 63 | pm_runtime_init(dev); | 64 | pm_runtime_init(dev); |
| 64 | } | 65 | } |