Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / drivers / base / power / suspend.c

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 1a1fe43a30570cec1054b446b065389cd8197fee..69509e02f703c6a32a9c158f70cf558bf70d77cb 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -116,12 +116,10 @@ int device_suspend(pm_message_t state)
                /* Check if the device got removed */
                if (!list_empty(&dev->power.entry)) {
                        /* Move it to the dpm_off or dpm_off_irq list */
-                       if (!error) {
-                               list_del(&dev->power.entry);
-                               list_add(&dev->power.entry, &dpm_off);
-                       } else if (error == -EAGAIN) {
-                               list_del(&dev->power.entry);
-                               list_add(&dev->power.entry, &dpm_off_irq);
+                       if (!error)
+                               list_move(&dev->power.entry, &dpm_off);
+                       else if (error == -EAGAIN) {
+                               list_move(&dev->power.entry, &dpm_off_irq);
                                error = 0;
                        }
                }
@@ -139,8 +137,7 @@ int device_suspend(pm_message_t state)
                 */
                while (!list_empty(&dpm_off_irq)) {
                        struct list_head * entry = dpm_off_irq.next;
-                       list_del(entry);
-                       list_add(entry, &dpm_off);
+                       list_move(entry, &dpm_off);
                }
                dpm_resume();
        }