]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 18 Dec 2009 22:03:10 +0000 (14:03 -0800)
commit bab636b921017f0db6e0c2979438f50b898a9808 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/base/power/runtime.c

index 846d89e3d12294d423af8a38ff57373d0b6f4505..0a4b75f834c02502e8a330e4f5828fcfaf28c229 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