From: Swen Schillig Date: Wed, 2 Jul 2008 08:56:31 +0000 (+0200) Subject: [SCSI] zfcp: wait until adapter is finished with ERP during auto-port X-Git-Tag: v2.6.27-rc1~1059^2~15 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c57a39a45a76bc8ecdd2c8a9bc7cf7be3ed73fe1;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley --- diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index aa2d9a668d1..34c9b20ce49 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;