2 files changed, 12 insertions, 2 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 3f64aded6caa..e50ea465bc2b 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -895,8 +895,13 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
                                 act->step = ZFCP_ERP_STEP_PORT_CLOSING;
                                 return ZFCP_ERP_CONTINUES;
                         }
-                /* fall through otherwise */
                 }
+                if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {
+                        port->d_id = 0;
+                        _zfcp_erp_port_reopen(port, 0, "erpsoc1", NULL);
+                        return ZFCP_ERP_EXIT;
+                }
+                /* fall through otherwise */
         }
         return ZFCP_ERP_FAILED;
 }
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index 19ae0842047c..bb2752b4130f 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -150,9 +150,14 @@ static void _zfcp_fc_incoming_rscn(struct zfcp_fsf_req *fsf_req, u32 range,
         struct zfcp_port *port;
 
         read_lock_irqsave(&zfcp_data.config_lock, flags);
-        list_for_each_entry(port, &fsf_req->adapter->port_list_head, list)
+        list_for_each_entry(port, &fsf_req->adapter->port_list_head, list) {
                 if ((port->d_id & range) == (elem->nport_did & range))
                         zfcp_test_link(port);
+                if (!port->d_id)
+                        zfcp_erp_port_reopen(port,
+                                             ZFCP_STATUS_COMMON_ERP_FAILED,
+                                             "fcrscn1", NULL);
+        }
 
         read_unlock_irqrestore(&zfcp_data.config_lock, flags);
 }