1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 0dff05840ee2..2ed3c7b48882 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -2968,6 +2968,13 @@ zfcp_fsf_close_physical_port_handler(struct zfcp_fsf_req *fsf_req)
                 zfcp_erp_port_boxed(port);
                 fsf_req->status |= ZFCP_STATUS_FSFREQ_ERROR |
                         ZFCP_STATUS_FSFREQ_RETRY;
+
+                /* can't use generic zfcp_erp_modify_port_status because
+                 * ZFCP_STATUS_COMMON_OPEN must not be reset for the port */
+                atomic_clear_mask(ZFCP_STATUS_PORT_PHYS_OPEN, &port->status);
+                list_for_each_entry(unit, &port->unit_list_head, list)
+                        atomic_clear_mask(ZFCP_STATUS_COMMON_OPEN,
+                                          &unit->status);
                 break;
 
         case FSF_ADAPTER_STATUS_AVAILABLE: