Commit 93b45af5 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by James Bottomley

[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: default avatarMatthew Wilcox <matthew@wil.cx>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 21db1882
...@@ -1549,6 +1549,9 @@ void scsi_scan_target(struct device *parent, unsigned int channel, ...@@ -1549,6 +1549,9 @@ void scsi_scan_target(struct device *parent, unsigned int channel,
{ {
struct Scsi_Host *shost = dev_to_shost(parent); struct Scsi_Host *shost = dev_to_shost(parent);
if (strncmp(scsi_scan_type, "none", 4) == 0)
return;
if (!shost->async_scan) if (!shost->async_scan)
scsi_complete_async_scans(); scsi_complete_async_scans();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment