summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/main.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 89a3ddd642c9..bcd043c1d385 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1304,18 +1304,12 @@ static int dpm_noirq_suspend_devices(pm_message_t state)
while (!list_empty(&dpm_late_early_list)) {
struct device *dev = to_device(dpm_late_early_list.prev);
+ list_move(&dev->power.entry, &dpm_noirq_list);
get_device(dev);
mutex_unlock(&dpm_list_mtx);
error = device_suspend_noirq(dev);
- mutex_lock(&dpm_list_mtx);
-
- if (!error && !list_empty(&dev->power.entry))
- list_move(&dev->power.entry, &dpm_noirq_list);
-
- mutex_unlock(&dpm_list_mtx);
-
put_device(dev);
mutex_lock(&dpm_list_mtx);
@@ -1486,19 +1480,13 @@ int dpm_suspend_late(pm_message_t state)
while (!list_empty(&dpm_suspended_list)) {
struct device *dev = to_device(dpm_suspended_list.prev);
+ list_move(&dev->power.entry, &dpm_late_early_list);
get_device(dev);
mutex_unlock(&dpm_list_mtx);
error = device_suspend_late(dev);
- mutex_lock(&dpm_list_mtx);
-
- if (!list_empty(&dev->power.entry))
- list_move(&dev->power.entry, &dpm_late_early_list);
-
- mutex_unlock(&dpm_list_mtx);
-
put_device(dev);
mutex_lock(&dpm_list_mtx);
@@ -1763,19 +1751,13 @@ int dpm_suspend(pm_message_t state)
while (!list_empty(&dpm_prepared_list)) {
struct device *dev = to_device(dpm_prepared_list.prev);
+ list_move(&dev->power.entry, &dpm_suspended_list);
get_device(dev);
mutex_unlock(&dpm_list_mtx);
error = device_suspend(dev);
- mutex_lock(&dpm_list_mtx);
-
- if (!error && !list_empty(&dev->power.entry))
- list_move(&dev->power.entry, &dpm_suspended_list);
-
- mutex_unlock(&dpm_list_mtx);
-
put_device(dev);
mutex_lock(&dpm_list_mtx);