From 71b0f59f7e0e4f73ccd728a275bbcac512ef7ff8 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@cam.org>
Date: Sat, 18 Jul 2009 20:34:37 -0400
Subject: [PATCH] --- yaml --- r: 155571 b: refs/heads/master c:
 6cdbf734493d6e8f5afc6f539b82897772809d43 h: refs/heads/master i:   155569:
 666dfb1ad9e2a7d411f0a7000470d962f5088134   155567:
 4461cdaec23c201a91b3ee5157368e654c17fca5 v: v3

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

diff --git a/[refs] b/[refs]
index a03bcc65628e..4cacce35f60d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ecf24ef49d4f46ff5d6af357c3b9ec8d798160d
+refs/heads/master: 6cdbf734493d6e8f5afc6f539b82897772809d43
diff --git a/trunk/drivers/mmc/host/mvsdio.c b/trunk/drivers/mmc/host/mvsdio.c
index b56d72ff06e9..34e23489811a 100644
--- a/trunk/drivers/mmc/host/mvsdio.c
+++ b/trunk/drivers/mmc/host/mvsdio.c
@@ -384,7 +384,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
 				u16 val[2] = {0, 0};
 				val[0] = mvsd_read(MVSD_FIFO);
 				val[1] = mvsd_read(MVSD_FIFO);
-				memcpy(p, &val, s);
+				memcpy(p, ((void *)&val) + 4 - s, s);
 				s = 0;
 				intr_status = mvsd_read(MVSD_NOR_INTR_STATUS);
 			}
@@ -423,7 +423,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev)
 		if (s < 4) {
 			if (s && (intr_status & MVSD_NOR_TX_AVAIL)) {
 				u16 val[2] = {0, 0};
-				memcpy(&val, p, s);
+				memcpy(((void *)&val) + 4 - s, p, s);
 				mvsd_write(MVSD_FIFO, val[0]);
 				mvsd_write(MVSD_FIFO, val[1]);
 				s = 0;