1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 0ec44ef840be..2ccee3763acf 100644
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -39,6 +39,7 @@ int suspend_device(struct device * dev, pm_message_t state)
 {
         int error = 0;
 
+        down(&dev->sem);
         if (dev->power.power_state) {
                 dev_dbg(dev, "PM: suspend %d-->%d\n",
                         dev->power.power_state, state);
@@ -58,7 +59,7 @@ int suspend_device(struct device * dev, pm_message_t state)
                 dev_dbg(dev, "suspending\n");
                 error = dev->bus->suspend(dev, state);
         }
-
+        up(&dev->sem);
         return error;
 }
 
@@ -113,8 +114,19 @@ int device_suspend(pm_message_t state)
                 put_device(dev);
         }
         up(&dpm_list_sem);
-        if (error)
+        if (error) {
+                /* we failed... before resuming, bring back devices from
+                 * dpm_off_irq list back to main dpm_off list, we do want
+                 * to call resume() on them, in case they partially suspended
+                 * despite returning -EAGAIN
+                 */
+                while (!list_empty(&dpm_off_irq)) {
+                        struct list_head * entry = dpm_off_irq.next;
+                        list_del(entry);
+                        list_add(entry, &dpm_off);
+                }
                 dpm_resume();
+        }
         up(&dpm_sem);
         return error;
 }