From 32290a4dfb8af6b6dface432ee72cef96be95361 Mon Sep 17 00:00:00 2001
From: Javier Martin <javier.martin@vista-silicon.com>
Date: Tue, 30 Oct 2012 16:54:07 +0100
Subject: [PATCH] --- yaml --- r: 336272 b: refs/heads/master c:
 2cb535529d52658613a2138677f5e497e633bead h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 839b4c5173bc..0fac1623f4b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49480cf2c29ffd2b6cb5213eaf8995bd1e16a345
+refs/heads/master: 2cb535529d52658613a2138677f5e497e633bead
diff --git a/trunk/drivers/mmc/host/mxcmmc.c b/trunk/drivers/mmc/host/mxcmmc.c
index 6290b7f1ccfe..29e680f193a0 100644
--- a/trunk/drivers/mmc/host/mxcmmc.c
+++ b/trunk/drivers/mmc/host/mxcmmc.c
@@ -240,7 +240,7 @@ static int mxcmci_setup_data(struct mxcmci_host *host, struct mmc_data *data)
 		return 0;
 
 	for_each_sg(data->sg, sg, data->sg_len, i) {
-		if (sg->offset & 3 || sg->length & 3) {
+		if (sg->offset & 3 || sg->length & 3 || sg->length < 512) {
 			host->do_dma = 0;
 			return 0;
 		}