---

yaml --- r: 88493 b: refs/heads/master c: 8bae0ff h: refs/heads/master i: 88491: 87a5b9c v: v3
git-mirror · Apr 17, 2008 · 53f6d4b · 53f6d4b
1 parent 87f523a
commit 53f6d4b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0349d1662027fee36e590640b3b05fd979ae26f8
+refs/heads/master: 8bae0ff2590c0b709d217da4466c6dba0b6b885c
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_intr.c b/trunk/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -833,7 +833,8 @@ void ipath_clear_freeze(struct ipath_devdata *dd)
 	 */
 	for (i = 0; i < dd->ipath_pioavregs; i++) {
 		/* deal with 6110 chip bug */
-		im = i > 3 ? i ^ 1 : i;
+		im = (i > 3 && (dd->ipath_flags & IPATH_SWAP_PIOBUFS)) ?
+			i ^ 1 : i;
 		val = ipath_read_kreg64(dd, (0x1000 / sizeof(u64)) + im);
 		dd->ipath_pioavailregs_dma[i] = cpu_to_le64(val);
 		dd->ipath_pioavailshadow[i] = val;