This commit was manufactured by cvs2svn to create tag

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

diff --git a/drivers/base/power/suspend.c b/drivers/base/power/suspend.c
index 94c1311..86f9e6e 100644 (file)
--- a/drivers/base/power/suspend.c
+++ b/drivers/base/power/suspend.c
@@ -63,6 +63,11 @@ int suspend_device(struct device * dev, u32 state)
  *     If we hit a failure with any of the devices, call device_resume()
  *     above to bring the suspended devices back to life.
  *
+ *     Note this function leaves dpm_sem held to
+ *     a) block other devices from registering.
+ *     b) prevent other PM operations from happening after we've begun.
+ *     c) make sure we're exclusive when we disable interrupts.
+ *
  */
 
 int device_suspend(u32 state)
@@ -70,43 +75,32 @@ int device_suspend(u32 state)
        int error = 0;
 
        down(&dpm_sem);
-       down(&dpm_list_sem);
-       while (!list_empty(&dpm_active) && error == 0) {
+       while(!list_empty(&dpm_active)) {
                struct list_head * entry = dpm_active.prev;
                struct device * dev = to_device(entry);
-
-               get_device(dev);
-               up(&dpm_list_sem);
-
                error = suspend_device(dev, state);
 
-               down(&dpm_list_sem);
-
-               /* 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);
-                               error = 0;
-                       }
-               }
-               if (error)
+               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);
+               } else {
                        printk(KERN_ERR "Could not suspend device %s: "
                                "error %d\n", kobject_name(&dev->kobj), error);
-               put_device(dev);
+                       goto Error;
+               }
        }
-       up(&dpm_list_sem);
-       if (error)
-               dpm_resume();
+ Done:
        up(&dpm_sem);
        return error;
+ Error:
+       dpm_resume();
+       goto Done;
 }
 
-EXPORT_SYMBOL_GPL(device_suspend);
+EXPORT_SYMBOL(device_suspend);
 
 
 /**
@@ -138,5 +132,5 @@ int device_power_down(u32 state)
        goto Done;
 }
 
-EXPORT_SYMBOL_GPL(device_power_down);
+EXPORT_SYMBOL(device_power_down);