From fecbc4e1cb7882585d8e5c7e797a879663380537 Mon Sep 17 00:00:00 2001
From: Christof Schmitt <christof.schmitt@de.ibm.com>
Date: Thu, 8 Jul 2010 09:53:10 +0200
Subject: [PATCH] --- yaml --- r: 204312 b: refs/heads/master c:
 f7bd7c3627a3cf06bf1c6da55339469ec1853a48 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/s390/scsi/zfcp_erp.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f69cfeee8a49..e379de6370fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c785d944e6fa7eef390c799b93e43243505780c
+refs/heads/master: f7bd7c3627a3cf06bf1c6da55339469ec1853a48
diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c
index 64471ba6ac09..160b432c907f 100644
--- a/trunk/drivers/s390/scsi/zfcp_erp.c
+++ b/trunk/drivers/s390/scsi/zfcp_erp.c
@@ -897,8 +897,7 @@ static int zfcp_erp_port_strategy_open_common(struct zfcp_erp_action *act)
 		}
 		if (port->d_id && !(p_status & ZFCP_STATUS_COMMON_NOESC)) {
 			port->d_id = 0;
-			_zfcp_erp_port_reopen(port, 0, "erpsoc1", NULL);
-			return ZFCP_ERP_EXIT;
+			return ZFCP_ERP_FAILED;
 		}
 		/* fall through otherwise */
 	}