From 388455551041bdf8d79e9db7076fc39cb9acdfdc Mon Sep 17 00:00:00 2001
From: Ben Dooks <ben-linux@fluff.org>
Date: Mon, 30 Jun 2008 22:40:39 +0100
Subject: [PATCH] --- yaml --- r: 102207 b: refs/heads/master c:
 7e9c7b64022b7faff6022df64baec8ab467d0bfd h: refs/heads/master i:   102205:
 74f9ee8bfd1a519445f99337c2530a4b84838302   102203:
 d0067e46aed79dcbd3c4750426830d52926a0483   102199:
 1598b1fb6bd098b1ea64489598a80c41ce1482ce   102191:
 62cbd1bce6ffbdbc52c22249aa2edff241a6cbaf   102175:
 3c844b3e12ef0ffbf6042f6595f10b707375a9f8   102143:
 3327e60d011cd0cc051c483398851504a04a5366 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/mmc/host/s3cmci.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 60ee3626283e..605247d002a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dde7f755211fd58105c989a99a3a9f2f1238fba
+refs/heads/master: 7e9c7b64022b7faff6022df64baec8ab467d0bfd
diff --git a/trunk/drivers/mmc/host/s3cmci.c b/trunk/drivers/mmc/host/s3cmci.c
index 2b4839536975..6a1e4994b724 100644
--- a/trunk/drivers/mmc/host/s3cmci.c
+++ b/trunk/drivers/mmc/host/s3cmci.c
@@ -807,6 +807,17 @@ static int s3cmci_setup_data(struct s3cmci_host *host, struct mmc_data *data)
 		return 0;
 	}
 
+	if ((data->blksz & 3) != 0) {
+		/* We cannot deal with unaligned blocks with more than
+		 * one block being transfered. */
+
+		if (data->blocks > 1)
+			return -EINVAL;
+
+		/* No support yet for non-word block transfers. */
+		return -EINVAL;
+	}
+
 	while (readl(host->base + S3C2410_SDIDSTA) &
 	       (S3C2410_SDIDSTA_TXDATAON | S3C2410_SDIDSTA_RXDATAON)) {