Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

…git/rafael/suspend-2.6 * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Runtime: fix recursive locking warning of lockdep from rpm_resume()
mariux64 · Oct 27, 2010 · d2d8f66 · d2d8f66
2 parents 474829e + d63be5f
commit d2d8f66
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
@@ -503,7 +503,7 @@ static int rpm_resume(struct device *dev, int rpmflags)
 	 * the resume will actually succeed.
 	 */
 	if (dev->power.no_callbacks && !parent && dev->parent) {
-		spin_lock(&dev->parent->power.lock);
+		spin_lock_nested(&dev->parent->power.lock, SINGLE_DEPTH_NESTING);
 		if (dev->parent->power.disable_depth > 0
 		    || dev->parent->power.ignore_children
 		    || dev->parent->power.runtime_status == RPM_ACTIVE) {