aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2009-12-03 14:21:21 -0500
committerRafael J. Wysocki <rjw@sisk.pl>2009-12-06 10:17:56 -0500
commitbab636b921017f0db6e0c2979438f50b898a9808 (patch)
treec220981cad0f886c0a7e34f54735e7bf384ff462 /drivers/base
parent66d0ae4d6ffa45b8e6d8bdbf85f8f1b285c8152d (diff)
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
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/runtime.c2
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)
777 } 777 }
778 778
779 if (parent) { 779 if (parent) {
780 spin_lock(&parent->power.lock); 780 spin_lock_nested(&parent->power.lock, SINGLE_DEPTH_NESTING);
781 781
782 /* 782 /*
783 * It is invalid to put an active child under a parent that is 783 * It is invalid to put an active child under a parent that is