diff options
| author | Laura Abbott <labbott@fedoraproject.org> | 2015-12-10 11:07:54 -0800 |
|---|---|---|
| committer | Laura Abbott <labbott@fedoraproject.org> | 2015-12-10 11:09:23 -0800 |
| commit | 135e50590974369a5415808badc7a2956bc290a8 (patch) | |
| tree | cfcc91f75d0b53427aaa4cfe40e54e0fd04f55f7 | |
| parent | 045e1363a3caae482109a2541053cb8c272076ad (diff) | |
| download | kernel-135e50590974369a5415808badc7a2956bc290a8.tar.gz kernel-135e50590974369a5415808badc7a2956bc290a8.tar.xz kernel-135e50590974369a5415808badc7a2956bc290a8.zip | |
Ignore errors from scsi_dh_add_device (rhbz 1288687)
| -rw-r--r-- | alua_fix.patch | 41 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 47 insertions, 0 deletions
diff --git a/alua_fix.patch b/alua_fix.patch new file mode 100644 index 000000000..eb278fabb --- /dev/null +++ b/alua_fix.patch @@ -0,0 +1,41 @@ +From 221255aee67ec1c752001080aafec0c4e9390d95 Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke <hare@suse.de> +Date: Tue, 1 Dec 2015 10:16:42 +0100 +Subject: scsi: ignore errors from scsi_dh_add_device() + +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(). + +Reviewed-by: Johannes Thumshirn <jthumshirn@suse.com> +Reviewed-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Hannes Reinecke <hare@suse.de> +Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +--- + 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 fc3cd26..d015374 100644 +--- a/drivers/scsi/scsi_sysfs.c ++++ b/drivers/scsi/scsi_sysfs.c +@@ -1120,11 +1120,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); +-- +cgit v0.11.2 + diff --git a/kernel.spec b/kernel.spec index d59d5d367..be7ca86f7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -630,6 +630,9 @@ Patch570: HID-multitouch-enable-palm-rejection-if-device-imple.patch #rhbz 1286293 Patch571: ideapad-laptop-Add-Lenovo-ideapad-Y700-17ISK-to-no_h.patch +#rhbz 1288687 +Patch572: alua_fix.patch + # END OF PATCH DEFINITIONS %endif @@ -2073,6 +2076,9 @@ fi # # %changelog +* Thu Dec 10 2015 Laura Abbott <labbott@redhat.com> +- Ignore errors from scsi_dh_add_device (rhbz 1288687) + * Thu Dec 10 2015 Josh Boyer <jwboyer@fedoraproject.org> - Fix rfkill issues on ideapad Y700-17ISK (rhbz 1286293) |