From 3e094118a51348eed0a86bcf6730776daf4c03d3 Mon Sep 17 00:00:00 2001
From: Roland Dreier <rolandd@cisco.com>
Date: Wed, 16 Apr 2008 21:01:07 -0700
Subject: [PATCH] --- yaml --- r: 88463 b: refs/heads/master c:
 6358ae25fd0d8cb4eab5e4e152ade8ac406b5278 h: refs/heads/master i:   88461:
 901a5d253e2572aa2ea38942798cfc306fff1e57   88459:
 78f61faf5aca24b8cebabe85d10e8f5b7426f052   88455:
 6ef154e2785b64050198ba29953017af0da72e0d   88447:
 f355d6b515e772228819beb46d00a8432ea640b6 v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index cc6f20544227..19e2d013c44d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ef6aee2f0ff111a2439b02b9d788097ca82f9d1
+refs/heads/master: 6358ae25fd0d8cb4eab5e4e152ade8ac406b5278
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c
index 4471674975cd..5428affa9102 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_init_chip.c
@@ -523,16 +523,16 @@ static void enable_chip(struct ipath_devdata *dd,
 	 * initial values of the generation bit correct.
 	 */
 	for (i = 0; i < dd->ipath_pioavregs; i++) {
-		__le64 val;
+		__le64 pioavail;
 
 		/*
 		 * Chip Errata bug 6641; even and odd qwords>3 are swapped.
 		 */
 		if (i > 3 && (dd->ipath_flags & IPATH_SWAP_PIOBUFS))
-			val = dd->ipath_pioavailregs_dma[i ^ 1];
+			pioavail = dd->ipath_pioavailregs_dma[i ^ 1];
 		else
-			val = dd->ipath_pioavailregs_dma[i];
-		dd->ipath_pioavailshadow[i] = le64_to_cpu(val);
+			pioavail = dd->ipath_pioavailregs_dma[i];
+		dd->ipath_pioavailshadow[i] = le64_to_cpu(pioavail);
 	}
 	/* can get counters, stats, etc. */
 	dd->ipath_flags |= IPATH_PRESENT;