diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-03 20:21:21 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-12-06 16:17:56 +0100 |
| commit | bab636b921017f0db6e0c2979438f50b898a9808 (patch) | |
| tree | c220981cad0f886c0a7e34f54735e7bf384ff462 | |
| parent | PM / Hibernate: Swap, use KERN_CONT (diff) | |
| download | linux-bab636b921017f0db6e0c2979438f50b898a9808.tar.xz linux-bab636b921017f0db6e0c2979438f50b898a9808.zip | |
PM / Runtime: Fix lockdep warning in __pm_runtime_set_status()
Lockdep complains about taking the parent lock in
__pm_runtime_set_status(), so mark it as nested.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable@kernel.org
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 846d89e3d122..0a4b75f834c0 100644 --- a/drivers/base/power/runtime.c +++ b/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 |