X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fbase%2Fpower%2Fresume.c;h=317edbf0feca6b383fb95980968c28b9947e2970;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=826093ef4c7eb0e83cd0fa5fc8564cf6416144ea;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 826093ef4..317edbf0f 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -9,7 +9,6 @@
  */
 
 #include <linux/device.h>
-#include <linux/resume-trace.h>
 #include "../base.h"
 #include "power.h"
 
@@ -24,8 +23,6 @@ int resume_device(struct device * dev)
 {
 	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) {
@@ -39,7 +36,6 @@ int resume_device(struct device * dev)
 		error = dev->bus->resume(dev);
 	}
 	up(&dev->sem);
-	TRACE_RESUME(error);
 	return error;
 }
 
@@ -53,7 +49,8 @@ void dpm_resume(void)
 		struct device * dev = to_device(entry);
 
 		get_device(dev);
-		list_move_tail(entry, &dpm_active);
+		list_del_init(entry);
+		list_add_tail(entry, &dpm_active);
 
 		up(&dpm_list_sem);
 		if (!dev->power.prev_state.event)
@@ -100,7 +97,8 @@ void dpm_power_up(void)
 		struct device * dev = to_device(entry);
 
 		get_device(dev);
-		list_move_tail(entry, &dpm_active);
+		list_del_init(entry);
+		list_add_tail(entry, &dpm_active);
 		resume_device(dev);
 		put_device(dev);
 	}