From 35d6f2fcd401281fe7c2359b7072d8b3915c1f9b Mon Sep 17 00:00:00 2001 From: chuck Date: Mon, 7 Jan 2002 17:26:46 -0500 Subject: [PATCH] [UBUNTU: scsi_scan] Return value of slave_configure is ignored. Closes: #57265. Signed-off-by: chuck --- drivers/scsi/scsi_scan.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 4e6709f..f9ebe12 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -783,8 +783,19 @@ static int scsi_add_lun(struct scsi_devi 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"); + } + } + } /* * Ok, the device is now all set up, we can -- 1.4.3.3