Message ID | 1447081703-110552-3-git-send-email-hare@suse.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, 2015-11-09 at 16:08 +0100, Hannes Reinecke wrote: > device handler initialisation might fail due to a number of > reasons. But as device_handlers are optional this shouldn't > cause us to disable the device entirely. > So just ignore errors from scsi_dh_add_device(). > > Signed-off-by: Hannes Reinecke <hare@suse.de> > --- > drivers/scsi/scsi_sysfs.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c > index 13a5ede..7b41b2c 100644 > --- a/drivers/scsi/scsi_sysfs.c > +++ b/drivers/scsi/scsi_sysfs.c > @@ -1118,11 +1118,12 @@ int scsi_sysfs_add_sdev(struct scsi_device > *sdev) > } > > error = scsi_dh_add_device(sdev); > - if (error) { > + if (error) > + /* > + * device_handler is optional, so any error can be > ignored > + */ > sdev_printk(KERN_INFO, sdev, > "failed to add device handler: > %d\n", error); > - return error; > - } > > device_enable_async_suspend(&sdev->sdev_dev); > error = device_add(&sdev->sdev_dev); Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 13a5ede..7b41b2c 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1118,11 +1118,12 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev) } error = scsi_dh_add_device(sdev); - if (error) { + if (error) + /* + * device_handler is optional, so any error can be ignored + */ sdev_printk(KERN_INFO, sdev, "failed to add device handler: %d\n", error); - return error; - } device_enable_async_suspend(&sdev->sdev_dev); error = device_add(&sdev->sdev_dev);
device handler initialisation might fail due to a number of reasons. But as device_handlers are optional this shouldn't cause us to disable the device entirely. So just ignore errors from scsi_dh_add_device(). Signed-off-by: Hannes Reinecke <hare@suse.de> --- drivers/scsi/scsi_sysfs.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)