diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
| commit | 9da305eb089c94c535d1790fd2dec16f44c1689f (patch) | |
| tree | f37f07f148fd7a793233c7f15c0fa9f46212049d /drivers/scsi/scsi_scan.c | |
| parent | d96212ed87d032d2d830e265aae14038dc1f8ad8 (diff) | |
| parent | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 374853df9cc..94e5167f260 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -266,8 +266,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, /* * if LLDD reports slave not present, don't clutter * console with alloc failure messages - - */ if (ret == -ENXIO) display_failure_msg = 0; @@ -279,7 +277,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, out_device_destroy: transport_destroy_device(&sdev->sdev_gendev); - scsi_free_queue(sdev->request_queue); put_device(&sdev->sdev_gendev); out: if (display_failure_msg) |