diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index d91d268dd331d0eb8ecea5e0423406a96f8a2439..3ccaa4be92d83cd1f165db3888ff170c8012e17c 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1549,6 +1549,9 @@ void scsi_scan_target(struct device *parent, unsigned int channel,
 {
 	struct Scsi_Host *shost = dev_to_shost(parent);
 
+	if (strncmp(scsi_scan_type, "none", 4) == 0)
+		return;
+
 	if (!shost->async_scan)
 		scsi_complete_async_scans();