diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-13 00:07:46 -0500 |
commit | 783e3385a134305d49d7b431df6e591265e7ec14 (patch) | |
tree | 7db0b8f854201e2ad343ea5b1c6fab7c3bca5a9b /drivers/scsi/scsi_scan.c | |
parent | fd803241744ad6e4262b6588c6af89e8fb794098 (diff) | |
parent | 1cf9e8a7865c0ac216034e519cf6b8505055ea50 (diff) |
Merge branch 'upstream-fixes'
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) |