From 55578fca38c5972288f3d13b973107786e9de3c9 Mon Sep 17 00:00:00 2001
From: Swen Schillig <swen@vnet.ibm.com>
Date: Fri, 17 Apr 2009 15:08:10 +0200
Subject: [PATCH] --- yaml --- r: 144439 b: refs/heads/master c:
 5b43e719308143ac02e6f4ee24132f8acad99ea7 h: refs/heads/master i:   144437:
 dd66e31f4faa22a7791b35679e0eeef8b450534d   144435:
 d48c7871c6ed3bc030b62165f982405c55ec3ae7   144431:
 e0c68f2bbff2304385dc2facae8482534b3b5277 v: v3

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

diff --git a/[refs] b/[refs]
index 84d2f9d9c630..d54bd565a45c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7306bf6150161689aaa445c433699895f446208
+refs/heads/master: 5b43e719308143ac02e6f4ee24132f8acad99ea7
diff --git a/trunk/drivers/s390/scsi/zfcp_fc.c b/trunk/drivers/s390/scsi/zfcp_fc.c
index a0f925013acf..db409684e06f 100644
--- a/trunk/drivers/s390/scsi/zfcp_fc.c
+++ b/trunk/drivers/s390/scsi/zfcp_fc.c
@@ -373,7 +373,8 @@ static void zfcp_fc_adisc_handler(unsigned long data)
 
 	if (adisc->els.status) {
 		/* request rejected or timed out */
-		zfcp_erp_port_forced_reopen(port, 0, "fcadh_1", NULL);
+		zfcp_erp_port_forced_reopen(port, ZFCP_STATUS_COMMON_ERP_FAILED,
+					    "fcadh_1", NULL);
 		goto out;
 	}