---

yaml --- r: 88510 b: refs/heads/master c: c4b4d16 h: refs/heads/master v: v3
git-mirror · Apr 17, 2008 · 950fa23 · 950fa23
1 parent 8e2fefe
commit 950fa23
Show file tree

Hide file tree

Showing 9 changed files with 226 additions and 146 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4330e4dad780467d930b394b5119c0218a1e2dbe
+refs/heads/master: c4b4d16e090e1b68d1d4d20a28757070982b9725
diff --git a/trunk/drivers/infiniband/hw/ipath/ipath_diag.c b/trunk/drivers/infiniband/hw/ipath/ipath_diag.c
@@ -439,7 +439,9 @@ static ssize_t ipath_diagpkt_write(struct file *fp,
 		goto bail;
 	}
 
-	piobuf = ipath_getpiobuf(dd, &pbufn);
+	plen >>= 2;		/* in dwords */
+
+	piobuf = ipath_getpiobuf(dd, plen, &pbufn);
 	if (!piobuf) {
 		ipath_cdbg(VERBOSE, "No PIO buffers avail unit for %u\n",
 			   dd->ipath_unit);
@@ -449,8 +451,6 @@ static ssize_t ipath_diagpkt_write(struct file *fp,
 	/* disarm it just to be extra sure */
 	ipath_disarm_piobufs(dd, pbufn, 1);
 
-	plen >>= 2;		/* in dwords */
-
 	if (ipath_debug & __IPATH_PKTDBG)
 		ipath_cdbg(VERBOSE, "unit %u 0x%x+1w pio%d\n",
 			   dd->ipath_unit, plen - 1, pbufn);