1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index e01cbf152a81..a6a29a24d28a 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -120,6 +120,9 @@ zfcp_ccw_remove(struct ccw_device *ccw_device)
 
         list_for_each_entry_safe(port, p, &adapter->port_remove_lh, list) {
                 list_for_each_entry_safe(unit, u, &port->unit_remove_lh, list) {
+                        if (atomic_test_mask(ZFCP_STATUS_UNIT_REGISTERED,
+                                &unit->status))
+                                scsi_remove_device(unit->device);
                         zfcp_unit_dequeue(unit);
                 }
                 zfcp_port_dequeue(port);