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