Commit 1c70132f 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/linux-pm 

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / Driver core: leave runtime PM enabled during system shutdown
parents 22c6b32d fe6b91f4

drivers/base/core.c

+4 −2
Original line number Diff line number Diff line
@@ -1743,8 +1743,10 @@ void device_shutdown(void) 
		 */

		list_del_init(&dev->kobj.entry);

		spin_unlock(&devices_kset->list_lock);

		/* Disable all device's runtime power management */

		pm_runtime_disable(dev);



		/* Don't allow any more runtime suspends */

		pm_runtime_get_noresume(dev);

		pm_runtime_barrier(dev);



		if (dev->bus && dev->bus->shutdown) {

			dev_dbg(dev, "shutdown\n");