Skip to content

Commit

Permalink
[SCSI] fix missing check for no scanning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthew Wilcox authored and James Bottomley committed Nov 22, 2006
1 parent 21db188 commit 93b45af
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/scsi/scsi_scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down

0 comments on commit 93b45af

Please sign in to comment.