diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/scsi/scsi_scan.c | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
| -rw-r--r-- | drivers/scsi/scsi_scan.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 5d4ca87af3df..9cd4404cf9ab 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -775,8 +775,20 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags) | |||
| 775 | 775 | ||
| 776 | transport_configure_device(&sdev->sdev_gendev); | 776 | transport_configure_device(&sdev->sdev_gendev); |
| 777 | 777 | ||
| 778 | if (sdev->host->hostt->slave_configure) | 778 | if (sdev->host->hostt->slave_configure) { |
| 779 | sdev->host->hostt->slave_configure(sdev); | 779 | int ret = sdev->host->hostt->slave_configure(sdev); |
| 780 | if (ret) { | ||
| 781 | /* | ||
| 782 | * if LLDD reports slave not present, don't clutter | ||
| 783 | * console with alloc failure messages | ||
| 784 | */ | ||
| 785 | if (ret != -ENXIO) { | ||
| 786 | sdev_printk(KERN_ERR, sdev, | ||
| 787 | "failed to configure device\n"); | ||
| 788 | } | ||
| 789 | return SCSI_SCAN_NO_RESPONSE; | ||
| 790 | } | ||
| 791 | } | ||
| 780 | 792 | ||
| 781 | /* | 793 | /* |
| 782 | * Ok, the device is now all set up, we can | 794 | * Ok, the device is now all set up, we can |