From ce0111c322c80d8c454c5771ef7fb96ed5974ca5 Mon Sep 17 00:00:00 2001
From: Swen Schillig <swen@vnet.ibm.com>
Date: Mon, 13 Jul 2009 15:06:12 +0200
Subject: [PATCH] --- yaml --- r: 156303 b: refs/heads/master c:
 17a093ef018481ee1760da19568bad3c11da395d h: refs/heads/master i:   156301:
 92f7f3198ccd3559c354b52c77dc841a8845da7c   156299:
 6ff8b8d20266d7c8dd7990fd66feb1d57826c974   156295:
 cefea80c692dc594e6e48bb890e4013a5deaa798   156287:
 9f22bc4d29ec6b8b4c65c0be4769906b73a21829 v: v3

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

diff --git a/[refs] b/[refs]
index b4e3d8b78ff2..b53ac5dad22f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 379d6bf6573ee6541a38bbe9140c1f0b94e3feae
+refs/heads/master: 17a093ef018481ee1760da19568bad3c11da395d
diff --git a/trunk/drivers/s390/scsi/zfcp_erp.c b/trunk/drivers/s390/scsi/zfcp_erp.c
index b5562f952654..c75d6f35cb5f 100644
--- a/trunk/drivers/s390/scsi/zfcp_erp.c
+++ b/trunk/drivers/s390/scsi/zfcp_erp.c
@@ -848,11 +848,17 @@ void zfcp_erp_port_strategy_open_lookup(struct work_struct *work)
 					      gid_pn_work);
 
 	retval = zfcp_fc_ns_gid_pn(&port->erp_action);
-	if (retval == -ENOMEM)
+	if (!retval) {
+		port->erp_action.step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP;
+		goto out;
+	}
+	if (retval == -ENOMEM) {
 		zfcp_erp_notify(&port->erp_action, ZFCP_STATUS_ERP_LOWMEM);
-	port->erp_action.step = ZFCP_ERP_STEP_NAMESERVER_LOOKUP;
-	if (retval)
-		zfcp_erp_notify(&port->erp_action, 0);
+		goto out;
+	}
+	/* all other error condtions */
+	zfcp_erp_notify(&port->erp_action, 0);
+out:
 	zfcp_port_put(port);
 }