1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index cf8c605ec32e..5411af447418 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2811,6 +2811,9 @@ void device_shutdown(void)
 {
         struct device *dev, *parent;
 
+        wait_for_device_probe();
+        device_block_probing();
+
         spin_lock(&devices_kset->list_lock);
         /*
          * Walk the devices list backward, shutting down each in turn.