Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/base/power/resume.c b/drivers/base/power/resume.c
index 317edbf0feca..520679ce53a8 100644
--- a/drivers/base/power/resume.c
+++ b/drivers/base/power/resume.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/device.h>
+#include <linux/resume-trace.h>
 #include "../base.h"
 #include "power.h"
 
@@ -23,6 +24,8 @@ 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) {
@@ -36,6 +39,7 @@ int resume_device(struct device * dev)
                 error = dev->bus->resume(dev);
         }
         up(&dev->sem);
+        TRACE_RESUME(error);
         return error;
 }