diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-13 07:34:32 +0300 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-13 07:34:32 +0300 |
commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/scsi/scsi_scan.c | |
parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
download | linux-525352eb6d355bef6adf597252fc6d04f2dbe66c.tar.xz |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 374853df9cca..94e5167f260d 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) |