From 543b57fb991d1373efc562a383eeebe05b8dbf16 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Sun, 20 Nov 2011 22:34:15 +0100
Subject: [PATCH] --- yaml --- r: 282244 b: refs/heads/master c:
 cd6dbb038a191b1bea34819de547f66a2187e309 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a94e48d6906e..73be8b4a91e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6f9091876fc07990d243072b03238a1f87b32a0
+refs/heads/master: cd6dbb038a191b1bea34819de547f66a2187e309
diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c
index 1c927acf5f08..1cd46cd7ff90 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_nx.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_nx.c
@@ -1055,7 +1055,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha)
 		    "ROM lock failed.\n");
 		return -1;
 	}
-	return 0;;
+	return 0;
 }
 
 static int