From d29db4397d3b2162346db4fa57d1f86767f2a7b6 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Mon, 8 Dec 2008 19:03:58 +0000
Subject: [PATCH] --- yaml --- r: 137167 b: refs/heads/master c:
 9e28d7e8c5422a47db886c4104221ea165595de0 h: refs/heads/master i:   137165:
 bc2f0dd44d556077853f5da922f02efa9b36ba7b   137163:
 2a931c10d87a446645658206a731e5d238665783   137159:
 43cd3afe86f9c3ab491f11f23403905e24bbf815   137151:
 97438c0a344138ed67cc75a6a2bace4ebb42a2f0 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mach-rpc/dma.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b449a8fa7ad2..507cfafca4f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d667522fdf637ef1b425518afe11aedba80364b2
+refs/heads/master: 9e28d7e8c5422a47db886c4104221ea165595de0
diff --git a/trunk/arch/arm/mach-rpc/dma.c b/trunk/arch/arm/mach-rpc/dma.c
index 0163592b2af0..a5987bbed60d 100644
--- a/trunk/arch/arm/mach-rpc/dma.c
+++ b/trunk/arch/arm/mach-rpc/dma.c
@@ -67,7 +67,7 @@ static void iomd_get_next_sg(struct scatterlist *sg, struct iomd_dma *idma)
 
 		if (idma->dma.sg->length == 0) {
 			if (idma->dma.sgcount > 1) {
-				idma->dma.sg++;
+				idma->dma.sg = sg_next(idma->dma.sg);
 				idma->dma.sgcount--;
 			} else {
 				idma->dma.sg = NULL;