From cbe2d7df8e5705e46bff9b88edaae03c5c845b89 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 24 Jun 2006 14:32:18 -0700
Subject: [PATCH] --- yaml --- r: 29547 b: refs/heads/master c:
 d02f40e81e003be6ddba5c176f2e40ea290c3729 h: refs/heads/master i:   29545:
 dbaa2b22ebd3f7bc352ff67a5a51764bb046c3f6   29543:
 836ff4eae50c5eb3fd43170541fb7b42efe56e40 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/base/power/resume.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 32e821d31d23..99e28983e11e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb71c87a492b7090ff9e8ac46912c480a1687e38
+refs/heads/master: d02f40e81e003be6ddba5c176f2e40ea290c3729
diff --git a/trunk/drivers/base/power/resume.c b/trunk/drivers/base/power/resume.c
index 317edbf0feca..520679ce53a8 100644
--- a/trunk/drivers/base/power/resume.c
+++ b/trunk/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;
 }