2 files changed, 3 insertions, 1 deletions

diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index c5f4bd217bfe..ae151390cb9f 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -50,7 +50,8 @@ static int zfcp_wka_port_get(struct zfcp_wka_port *wka_port)
         if (mutex_lock_interruptible(&wka_port->mutex))
                 return -ERESTARTSYS;
 
-        if (wka_port->status != ZFCP_WKA_PORT_ONLINE) {
+        if (wka_port->status == ZFCP_WKA_PORT_OFFLINE ||
+            wka_port->status == ZFCP_WKA_PORT_CLOSING) {
                 wka_port->status = ZFCP_WKA_PORT_OPENING;
                 if (zfcp_fsf_open_wka_port(wka_port))
                         wka_port->status = ZFCP_WKA_PORT_OFFLINE;
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index d024442ee128..48bfd3049244 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1584,6 +1584,7 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req)
                 wka_port->status = ZFCP_WKA_PORT_OFFLINE;
                 break;
         case FSF_PORT_ALREADY_OPEN:
+                break;
         case FSF_GOOD:
                 wka_port->handle = header->port_handle;
                 wka_port->status = ZFCP_WKA_PORT_ONLINE;