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

Commit b17b8499 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: Don't enable interrupts while running in_interrupt
parents 785eb10b c3810c88

drivers/base/power/runtime.c

+6 −3
Original line number Diff line number Diff line
@@ -407,12 +407,15 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
		goto out;

	}



	/* Maybe the parent is now able to suspend. */

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

		spin_unlock_irq(&dev->power.lock);

		spin_unlock(&dev->power.lock);



		pm_request_idle(parent);

		spin_lock(&parent->power.lock);

		rpm_idle(parent, RPM_ASYNC);

		spin_unlock(&parent->power.lock);



		spin_lock_irq(&dev->power.lock);

		spin_lock(&dev->power.lock);

	}



 out: