[SCSI] zfcp: wait until adapter is finished with ERP during auto-port

In some situations the auto port attachment task is started
before the ERP is finished. To prevent this unwanted situation
we wait until the adapter is up and running before we start our work.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c
index aa2d9a668d17..34c9b20ce493 100644
--- a/drivers/s390/scsi/zfcp_fc.c
+++ b/drivers/s390/scsi/zfcp_fc.c
@@ -520,6 +520,7 @@ int zfcp_scan_ports(struct zfcp_adapter *adapter)
         int ret, i;
         struct zfcp_gpn_ft *gpn_ft;
 
+        zfcp_erp_wait(adapter); /* wait until adapter is finished with ERP */
         if (fc_host_port_type(adapter->scsi_host) != FC_PORTTYPE_NPORT)
                 return 0;