diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/base/power/main.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/base/power/main.c')
| -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 e0dc4071e088..8aa2443182d5 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c | |||
| @@ -511,6 +511,7 @@ static void dpm_complete(pm_message_t state) | |||
| 511 | 511 | ||
| 512 | INIT_LIST_HEAD(&list); | 512 | INIT_LIST_HEAD(&list); |
| 513 | mutex_lock(&dpm_list_mtx); | 513 | mutex_lock(&dpm_list_mtx); |
| 514 | transition_started = false; | ||
| 514 | while (!list_empty(&dpm_list)) { | 515 | while (!list_empty(&dpm_list)) { |
| 515 | struct device *dev = to_device(dpm_list.prev); | 516 | struct device *dev = to_device(dpm_list.prev); |
| 516 | 517 | ||