PM / Runtime: Fix lockdep warning in __pm_runtime_set_status()
authorRafael J. Wysocki <rjw@sisk.pl>
Thu, 3 Dec 2009 19:21:21 +0000 (20:21 +0100)
committerRafael J. Wysocki <rjw@sisk.pl>
Sun, 6 Dec 2009 15:17:56 +0000 (16:17 +0100)
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
drivers/base/power/runtime.c

index 846d89e..0a4b75f 100644 (file)
@@ -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