From fdf32848187eedce88a6bc47eb01e0ce4aa4d096 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <aherrman@de.ibm.com>
Date: Mon, 13 Jun 2005 13:13:45 +0200
Subject: [PATCH] --- yaml --- r: 2083 b: refs/heads/master c:
 66c8684abf80a9999392d639627afea80ac62e06 h: refs/heads/master i:   2081:
 b91ec7e1cf827bad5d1e80f946c71823aaf89ec3   2079:
 dc128a757d01de6e1478b9e01719f387be7f0e87 v: v3

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

diff --git a/[refs] b/[refs]
index 8188056d4315..acd444cd772b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6cbbad7296538b6a38c0fe36e6ecf67f1e600a7
+refs/heads/master: 66c8684abf80a9999392d639627afea80ac62e06
diff --git a/trunk/drivers/s390/scsi/zfcp_aux.c b/trunk/drivers/s390/scsi/zfcp_aux.c
index 52fc1d789066..6bb4d332b474 100644
--- a/trunk/drivers/s390/scsi/zfcp_aux.c
+++ b/trunk/drivers/s390/scsi/zfcp_aux.c
@@ -1753,7 +1753,10 @@ static void zfcp_ns_gid_pn_handler(unsigned long data)
 	ct_iu_req = zfcp_sg_to_address(ct->req);
 	ct_iu_resp = zfcp_sg_to_address(ct->resp);
 
-	if ((ct->status != 0) || zfcp_check_ct_response(&ct_iu_resp->header)) {
+	if (ct->status != 0)
+		goto failed;
+
+	if (zfcp_check_ct_response(&ct_iu_resp->header)) {
 		/* FIXME: do we need some specific erp entry points */
 		atomic_set_mask(ZFCP_STATUS_PORT_INVALID_WWPN, &port->status);
 		goto failed;