1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index c663eb2ecf32..5a71b73211df 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -141,9 +141,13 @@ static int zfcp_erp_required_act(int want, struct zfcp_adapter *adapter,
                 if (!(p_status & ZFCP_STATUS_COMMON_UNBLOCKED))
                         need = ZFCP_ERP_ACTION_REOPEN_PORT;
                 /* fall through */
-        case ZFCP_ERP_ACTION_REOPEN_PORT:
         case ZFCP_ERP_ACTION_REOPEN_PORT_FORCED:
                 p_status = atomic_read(&port->status);
+                if (!(p_status & ZFCP_STATUS_COMMON_OPEN))
+                        need = ZFCP_ERP_ACTION_REOPEN_PORT;
+                /* fall through */
+        case ZFCP_ERP_ACTION_REOPEN_PORT:
+                p_status = atomic_read(&port->status);
                 if (p_status & ZFCP_STATUS_COMMON_ERP_INUSE)
                         return 0;
                 a_status = atomic_read(&adapter->status);