From 8855e2bafc9e09bcff8aa7ec3edb61dc835b6f35 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 21 Sep 2009 09:17:58 -0700
Subject: [PATCH] --- yaml --- r: 165850 b: refs/heads/master c:
 f477f5b3316f39c841aa121a219b82b3a56e7da7 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/dma/ioat/dma_v2.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a5721e53661f..734f58449b9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1b6df6930994d5d027375b07ac9da63644eb5758
+refs/heads/master: f477f5b3316f39c841aa121a219b82b3a56e7da7
diff --git a/trunk/drivers/dma/ioat/dma_v2.c b/trunk/drivers/dma/ioat/dma_v2.c
index 8fd0b59f1902..96ffab7d37a7 100644
--- a/trunk/drivers/dma/ioat/dma_v2.c
+++ b/trunk/drivers/dma/ioat/dma_v2.c
@@ -692,7 +692,8 @@ ioat2_dma_prep_memcpy_lock(struct dma_chan *c, dma_addr_t dma_dest,
 		/* pass */;
 	else
 		return NULL;
-	for (i = 0; i < num_descs; i++) {
+	i = 0;
+	do {
 		size_t copy = min_t(size_t, len, 1 << ioat->xfercap_log);
 
 		desc = ioat2_get_ring_ent(ioat, idx + i);
@@ -707,7 +708,7 @@ ioat2_dma_prep_memcpy_lock(struct dma_chan *c, dma_addr_t dma_dest,
 		dst += copy;
 		src += copy;
 		dump_desc_dbg(ioat, desc);
-	}
+	} while (++i < num_descs);
 
 	desc->txd.flags = flags;
 	desc->len = total_len;