Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "This is our remaining set of three fixes for 4.0: two oops fixes(one
  for cable pulls triggering oopses and the other be2iscsi specific) and
  one warn on in sysfs on multipath devices using enclosures"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  Defer processing of REQ_PREEMPT requests for blocked devices
  be2iscsi: Fix kernel panic when device initialization fails
  enclosure: fix WARN_ON removing an adapter in multi-path devices

1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 38552a31304a..65fed7146e9b 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -202,16 +202,17 @@ static void enclosure_remove_links(struct enclosure_component *cdev)
 {
         char name[ENCLOSURE_NAME_SIZE];
 
+        enclosure_link_name(cdev, name);
+
         /*
          * In odd circumstances, like multipath devices, something else may
          * already have removed the links, so check for this condition first.
          */
-        if (!cdev->dev->kobj.sd)
-                return;
+        if (cdev->dev->kobj.sd)
+                sysfs_remove_link(&cdev->dev->kobj, name);
 
-        enclosure_link_name(cdev, name);
-        sysfs_remove_link(&cdev->dev->kobj, name);
-        sysfs_remove_link(&cdev->cdev.kobj, "device");
+        if (cdev->cdev.kobj.sd)
+                sysfs_remove_link(&cdev->cdev.kobj, "device");
 }
 
 static int enclosure_add_links(struct enclosure_component *cdev)