From 5b593b842c7c3333cd4497b6a804b73a6b718af0 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Mon, 11 Oct 2010 23:59:58 +0200
Subject: [PATCH] --- yaml --- r: 212379 b: refs/heads/master c:
 2ac21c6bc4249ee6d922f18dbec7266377592c32 h: refs/heads/master i:   212377:
 db0928f167f5d07f5fe2bdcf8bc0d37bbb2c54d2   212375:
 3ce3eea956958133bcd5d1b8fdc5661c8681fd49 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/base/power/trace.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6dfb32a87501..ba29a9a99306 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f71648d73c1650b8b4aceb3856bebbde6daa3b86
+refs/heads/master: 2ac21c6bc4249ee6d922f18dbec7266377592c32
diff --git a/trunk/drivers/base/power/trace.c b/trunk/drivers/base/power/trace.c
index 0a1a2c4dbc6e..17e24e3f4422 100644
--- a/trunk/drivers/base/power/trace.c
+++ b/trunk/drivers/base/power/trace.c
@@ -188,8 +188,10 @@ static int show_file_hash(unsigned int value)
 static int show_dev_hash(unsigned int value)
 {
 	int match = 0;
-	struct list_head *entry = dpm_list.prev;
+	struct list_head *entry;
 
+	device_pm_lock();
+	entry = dpm_list.prev;
 	while (entry != &dpm_list) {
 		struct device * dev = to_device(entry);
 		unsigned int hash = hash_string(DEVSEED, dev_name(dev), DEVHASH);
@@ -199,6 +201,7 @@ static int show_dev_hash(unsigned int value)
 		}
 		entry = entry->prev;
 	}
+	device_pm_unlock();
 	return match;
 }