1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index d8b3d89db04..919daa7cd5b 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -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");