From c194c88f9e74628617eb2092c772ee17edbfd81d Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Mon, 11 Jun 2012 18:31:31 -0700
Subject: [PATCH] --- yaml --- r: 310851 b: refs/heads/master c:
 d4f75b567bb63b51e5ecd42af1e82d5aed5100dd h: refs/heads/master i:   310849:
 7c43526205debe585dbb572c509b7087b8623577   310847:
 46ef8f36a4ae2d278df58f2a547fcc702cc3137e v: v3

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

diff --git a/[refs] b/[refs]
index 9f9359399fad..bfc8bceb8e07 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9389c3c943da7e5f903eebf79d596601537afe01
+refs/heads/master: d4f75b567bb63b51e5ecd42af1e82d5aed5100dd
diff --git a/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index 2f12c0921334..6e64314dbbb3 100644
--- a/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -137,13 +137,15 @@ static char *tcm_qla2xxx_get_fabric_name(void)
  */
 static int tcm_qla2xxx_npiv_extract_wwn(const char *ns, u64 *nm)
 {
-	unsigned int i, j, value;
+	unsigned int i, j;
 	u8 wwn[8];
 
 	memset(wwn, 0, sizeof(wwn));
 
 	/* Validate and store the new name */
 	for (i = 0, j = 0; i < 16; i++) {
+		int value;
+
 		value = hex_to_bin(*ns++);
 		if (value >= 0)
 			j = (j << 4) | value;