---

yaml --- r: 172347 b: refs/heads/master c: bab636b h: refs/heads/master i: 172345: 2ae7ee9 172343: f505c09 v: v3
git-mirror · Dec 6, 2009 · 6efd851 · 6efd851
1 parent 34a9849
commit 6efd851
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66d0ae4d6ffa45b8e6d8bdbf85f8f1b285c8152d
+refs/heads/master: bab636b921017f0db6e0c2979438f50b898a9808
diff --git a/trunk/drivers/base/power/runtime.c b/trunk/drivers/base/power/runtime.c
@@ -777,7 +777,7 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)
 	}
 
 	if (parent) {
-		spin_lock(&parent->power.lock);
+		spin_lock_nested(&parent->power.lock, SINGLE_DEPTH_NESTING);
 
 		/*
 		 * It is invalid to put an active child under a parent that is