1 files changed, 11 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_wait_scan.c b/drivers/scsi/scsi_wait_scan.c
index 2f21af21269a..74708fcaf82f 100644
--- a/drivers/scsi/scsi_wait_scan.c
+++ b/drivers/scsi/scsi_wait_scan.c
@@ -11,10 +11,21 @@
  */
 
 #include <linux/module.h>
+#include <linux/device.h>
 #include <scsi/scsi_scan.h>
 
 static int __init wait_scan_init(void)
 {
+        /*
+         * First we need to wait for device probing to finish;
+         * the drivers we just loaded might just still be probing
+         * and might not yet have reached the scsi async scanning
+         */
+        wait_for_device_probe();
+        /*
+         * and then we wait for the actual asynchronous scsi scan
+         * to finish.
+         */
         scsi_complete_async_scans();
         return 0;
 }