Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d8f66b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Runtime: fix recursive locking warning of lockdep from rpm_resume()
parents 474829e8 d63be5f9

drivers/base/power/runtime.c

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ static int rpm_resume(struct device *dev, int rpmflags) 
	 * the resume will actually succeed.

	 */

	if (dev->power.no_callbacks && !parent && dev->parent) {

		spin_lock(&dev->parent->power.lock);

		spin_lock_nested(&dev->parent->power.lock, SINGLE_DEPTH_NESTING);

		if (dev->parent->power.disable_depth > 0

		    || dev->parent->power.ignore_children

		    || dev->parent->power.runtime_status == RPM_ACTIVE) {