commit 93b45af5c6b9d41bbe9da11442291ac4eefc15b4
author Matthew Wilcox <matthew@wil.cx> Wed Nov 22 13:24:53 2006 -0700
committer James Bottomley <jejb@mulgrave.il.steeleye.com> Wed Nov 22 16:41:52 2006 -0600
tree b88045d3b18c495e0fc3b573a54edb0ee75039ff
parent 21db1882f79a1ad5977cae6766376a63f60ec414

[SCSI] fix missing check for no scanning

Drivers that called scsi_scan_target() instead of scsi_scan_host() were
still adding devices; this needs to be under the control of userspace,
not the driver.

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/scsi/scsi_scan.c

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index d91d268..3ccaa4b 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1549,6 +1549,9 @@
 {
 	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();