diff options
| author | Matthew Wilcox <matthew@wil.cx> | 2006-11-22 13:24:53 -0700 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-11-22 16:41:52 -0600 |
| commit | 93b45af5c6b9d41bbe9da11442291ac4eefc15b4 (patch) | |
| tree | b88045d3b18c495e0fc3b573a54edb0ee75039ff /drivers/scsi | |
| parent | 21db1882f79a1ad5977cae6766376a63f60ec414 (diff) | |
| download | linux-93b45af5c6b9d41bbe9da11442291ac4eefc15b4.tar.gz linux-93b45af5c6b9d41bbe9da11442291ac4eefc15b4.tar.bz2 linux-93b45af5c6b9d41bbe9da11442291ac4eefc15b4.zip | |
[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>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index d91d268dd331..3ccaa4be92d8 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(); |