From 38ba1f6c74e83889a7810e87873606716952dc63 Mon Sep 17 00:00:00 2001
From: Wolfgang Muees <wolfgang.mues@auerswald.de>
Date: Fri, 5 Mar 2010 13:43:38 -0800
Subject: [PATCH] --- yaml --- r: 186291 b: refs/heads/master c:
 0b3520f2df8e4e5dad6a7b2743d037bf06c22024 h: refs/heads/master i:   186289:
 499e98b67f95066802b79537c7c692e1a9a17c46   186287:
 e412dca301af80555374ce2166c83e2e1efae81a v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mmc/host/at91_mci.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 07c2ac0c67fc..bb7057e6825f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396
+refs/heads/master: 0b3520f2df8e4e5dad6a7b2743d037bf06c22024
diff --git a/trunk/drivers/mmc/host/at91_mci.c b/trunk/drivers/mmc/host/at91_mci.c
index 63924e0c7ea9..4e1b2e6288da 100644
--- a/trunk/drivers/mmc/host/at91_mci.c
+++ b/trunk/drivers/mmc/host/at91_mci.c
@@ -227,11 +227,13 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data
 			for (index = 0; index < (amount / 4); index++)
 				*dmabuf++ = swab32(sgbuffer[index]);
 		} else {
-			memcpy(dmabuf, sgbuffer, amount);
-			dmabuf += amount;
+			char *tmpv = (char *)dmabuf;
+			memcpy(tmpv, sgbuffer, amount);
+			tmpv += amount;
+			dmabuf = (unsigned *)tmpv;
 		}
 
-		kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ);
+		kunmap_atomic(((void *)sgbuffer) - sg->offset, KM_BIO_SRC_IRQ);
 
 		if (size == 0)
 			break;