From f7a4c61012ba4a72fd575a8ffe4ab0fe79f555f4 Mon Sep 17 00:00:00 2001
From: Christof Schmitt <christof.schmitt@de.ibm.com>
Date: Tue, 28 Aug 2007 09:30:59 +0200
Subject: [PATCH] --- yaml --- r: 68855 b: refs/heads/master c:
 6b76a72141c57260adaf07977f79760ddb8618ee h: refs/heads/master i:   68853:
 25c10816f43456115f797c6dd4b9468689fde251   68851:
 2fe787e235f12f0e541d235aedb6977a18b62616   68847:
 0f069c8e736e0b7b6436dad3c043efa3c91f11f6 v: v3

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

diff --git a/[refs] b/[refs]
index f46b58ff4b93..137b0d628c28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ddd90a5b1618523dbfe3a11c50945f6660135a0
+refs/heads/master: 6b76a72141c57260adaf07977f79760ddb8618ee
diff --git a/trunk/drivers/s390/scsi/zfcp_scsi.c b/trunk/drivers/s390/scsi/zfcp_scsi.c
index ad7eb4a9261c..3a7f3b87fb36 100644
--- a/trunk/drivers/s390/scsi/zfcp_scsi.c
+++ b/trunk/drivers/s390/scsi/zfcp_scsi.c
@@ -189,10 +189,9 @@ static void zfcp_scsi_slave_destroy(struct scsi_device *sdpnt)
 		unit->device = NULL;
 		zfcp_erp_unit_failed(unit);
 		zfcp_unit_put(unit);
-	} else {
+	} else
 		ZFCP_LOG_NORMAL("bug: no unit associated with SCSI device at "
 				"address %p\n", sdpnt);
-	}
 }
 
 /* 
@@ -361,12 +360,11 @@ zfcp_unit_lookup(struct zfcp_adapter *adapter, int channel, unsigned int id,
 	list_for_each_entry(port, &adapter->port_list_head, list) {
 		if (!port->rport || (id != port->rport->scsi_target_id))
 			continue;
-		list_for_each_entry(unit, &port->unit_list_head, list) {
+		list_for_each_entry(unit, &port->unit_list_head, list)
 			if (lun == unit->scsi_lun) {
 				retval = unit;
 				goto out;
 			}
-		}
 	}
  out:
 	return retval;