From: Christoph Hellwig <hch@lst.de>
Date: Fri, 17 Feb 2006 11:11:29 +0000 (+0100)
Subject: [SCSI] scsi: handle ->slave_configure return value
X-Git-Tag: v2.6.16-rc6~139^2~5
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=938050916f57f08e20595b1fa1c1e57c2fbf7243;p=linux-2.6-omap-h63xx.git

[SCSI] scsi: handle ->slave_configure return value

When ­>slave_configure fails the scsi midlayer should handle it.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 5acb83ca5ae..f9ecc3dea7d 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -752,8 +752,20 @@ static int scsi_add_lun(struct scsi_device *sdev, char *inq_result, int *bflags)
 
 	transport_configure_device(&sdev->sdev_gendev);
 
-	if (sdev->host->hostt->slave_configure)
-		sdev->host->hostt->slave_configure(sdev);
+	if (sdev->host->hostt->slave_configure) {
+		int ret = sdev->host->hostt->slave_configure(sdev);
+		if (ret) {
+			/*
+			 * if LLDD reports slave not present, don't clutter
+			 * console with alloc failure messages
+			 */
+			if (ret != -ENXIO) {
+				sdev_printk(KERN_ERR, sdev,
+					"failed to configure device\n");
+			}
+			return SCSI_SCAN_NO_RESPONSE;
+		}
+	}
 
 	/*
 	 * Ok, the device is now all set up, we can