From 3cdb8ed034e69f97b19ada1b84df49276d05b8bd 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: 280469 b: refs/heads/master c:
 e56e0b7dd5f0ee7d5c2ebc0c049a745f1d715d42 h: refs/heads/master i:   280467:
 1b35cd883df61bcf1e9b244896926afd3d78bbfe 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 39c7e490ece6..d85e299c16f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 521b8ce615c6550a63c49305b649a1572e1f37ac
+refs/heads/master: e56e0b7dd5f0ee7d5c2ebc0c049a745f1d715d42
diff --git a/trunk/drivers/scsi/qla2xxx/qla_nx.c b/trunk/drivers/scsi/qla2xxx/qla_nx.c
index 94bded5ddce4..b9b3e5a38ae3 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