Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

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

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 1d830be..826093e 100644 (file)
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -9,10 +9,10 @@
  */
 
 #include <linux/device.h>
+#include <linux/resume-trace.h>
+#include "../base.h"
 #include "power.h"
 
-extern int sysdev_resume(void);
-
 
 /**
  *     resume_device - Restore state for one device.
@@ -22,25 +22,46 @@ extern int sysdev_resume(void);
 
 int resume_device(struct device * dev)
 {
-       if (dev->bus && dev->bus->resume)
-               return dev->bus->resume(dev);
-       return 0;
+       int error = 0;
+
+       TRACE_DEVICE(dev);
+       TRACE_RESUME(0);
+       down(&dev->sem);
+       if (dev->power.pm_parent
+                       && dev->power.pm_parent->power.power_state.event) {
+               dev_err(dev, "PM: resume from %d, parent %s still %d\n",
+                       dev->power.power_state.event,
+                       dev->power.pm_parent->bus_id,
+                       dev->power.pm_parent->power.power_state.event);
+       }
+       if (dev->bus && dev->bus->resume) {
+               dev_dbg(dev,"resuming\n");
+               error = dev->bus->resume(dev);
+       }
+       up(&dev->sem);
+       TRACE_RESUME(error);
+       return error;
 }
 
 
 
 void dpm_resume(void)
 {
+       down(&dpm_list_sem);
        while(!list_empty(&dpm_off)) {
                struct list_head * entry = dpm_off.next;
                struct device * dev = to_device(entry);
-               list_del_init(entry);
 
-               if (!dev->power.prev_state)
-                       resume_device(dev);
+               get_device(dev);
+               list_move_tail(entry, &dpm_active);
 
-               list_add_tail(entry, &dpm_active);
+               up(&dpm_list_sem);
+               if (!dev->power.prev_state.event)
+                       resume_device(dev);
+               down(&dpm_list_sem);
+               put_device(dev);
        }
+       up(&dpm_list_sem);
 }
 
 
@@ -58,7 +79,7 @@ void device_resume(void)
        up(&dpm_sem);
 }
 
-EXPORT_SYMBOL(device_resume);
+EXPORT_SYMBOL_GPL(device_resume);
 
 
 /**
@@ -76,9 +97,12 @@ void dpm_power_up(void)
 {
        while(!list_empty(&dpm_off_irq)) {
                struct list_head * entry = dpm_off_irq.next;
-               list_del_init(entry);
-               resume_device(to_device(entry));
-               list_add_tail(entry, &dpm_active);
+               struct device * dev = to_device(entry);
+
+               get_device(dev);
+               list_move_tail(entry, &dpm_active);
+               resume_device(dev);
+               put_device(dev);
        }
 }
 
@@ -97,6 +121,6 @@ void device_power_up(void)
        dpm_power_up();
 }
 
-EXPORT_SYMBOL(device_power_up);
+EXPORT_SYMBOL_GPL(device_power_up);