diff --git a/[refs] b/[refs]
index 9f4c4d189cf1..a079c35c36e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c263ff65d5936113cfcbb8139d34122361e2306e
+refs/heads/master: 0349d1662027fee36e590640b3b05fd979ae26f8
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_intr.c b/trunk/drivers/infiniband/hw/ipath/ipath_intr.c
index 3b8995206657..d12dfadaece7 100644
--- a/trunk/drivers/infiniband/hw/ipath/ipath_intr.c
+++ b/trunk/drivers/infiniband/hw/ipath/ipath_intr.c
@@ -798,7 +798,7 @@ static int handle_errors(struct ipath_devdata *dd, ipath_err_t errs)
 void ipath_clear_freeze(struct ipath_devdata *dd)
 {
 	int i, im;
-	__le64 val;
+	u64 val;
 	unsigned long flags;
 
 	/* disable error interrupts, to avoid confusion */
@@ -835,8 +835,8 @@ void ipath_clear_freeze(struct ipath_devdata *dd)
 		/* deal with 6110 chip bug */
 		im = i > 3 ? i ^ 1 : i;
 		val = ipath_read_kreg64(dd, (0x1000 / sizeof(u64)) + im);
-		dd->ipath_pioavailregs_dma[i] = dd->ipath_pioavailshadow[i]
-			= le64_to_cpu(val);
+		dd->ipath_pioavailregs_dma[i] = cpu_to_le64(val);
+		dd->ipath_pioavailshadow[i] = val;
 	}
 
 	/*