From 6efd8518141a953107030e185306d56e9c64cd7e Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 3 Dec 2009 20:21:21 +0100 Subject: [PATCH] --- yaml --- r: 172347 b: refs/heads/master c: bab636b921017f0db6e0c2979438f50b898a9808 h: refs/heads/master i: 172345: 2ae7ee9ad3bd20d5fda83653a33f42cda5c7fc8c 172343: f505c09d956ea8bf0265231445a45b6534d7ac28 v: v3 --- [refs] | 2 +- trunk/drivers/base/power/runtime.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 510e2e540a9a..f6b9ba0acae4 100644 --- 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 index 846d89e3d122..0a4b75f834c0 100644 --- 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