3 files changed, 10 insertions, 2 deletions

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 9fa1b064893e..86a8725430a4 100644
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -212,6 +212,7 @@ struct zfcp_port {
         struct work_struct     test_link_work;
         struct work_struct     rport_work;
         enum { RPORT_NONE, RPORT_ADD, RPORT_DEL }  rport_task;
+        unsigned int            starget_id;
 };
 
 struct zfcp_unit {
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 4cab33a2f7be..9d117ee7159a 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -564,6 +564,7 @@ static void zfcp_scsi_rport_register(struct zfcp_port *port)
         rport->maxframe_size = port->maxframe_size;
         rport->supported_classes = port->supported_classes;
         port->rport = rport;
+        port->starget_id = rport->scsi_target_id;
 
         zfcp_scsi_queue_unit_register(port);
 }
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 205b9f8056e2..b4561c86e230 100644
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -290,6 +290,7 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
         struct zfcp_unit *unit;
         u64 fcp_lun;
         int retval = -EINVAL;
+        struct scsi_device *sdev;
 
         if (!(port && get_device(&port->dev)))
                 return -EBUSY;
@@ -303,8 +304,13 @@ static ssize_t zfcp_sysfs_unit_remove_store(struct device *dev,
         else
                 retval = 0;
 
-        /* wait for possible timeout during SCSI probe */
-        flush_work(&unit->scsi_work);
+        sdev = scsi_device_lookup(port->adapter->scsi_host, 0,
+                                  port->starget_id,
+                                  scsilun_to_int((struct scsi_lun *)&fcp_lun));
+        if (sdev) {
+                scsi_remove_device(sdev);
+                scsi_device_put(sdev);
+        }
 
         write_lock_irq(&port->unit_list_lock);
         list_del(&unit->list);