summaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-06-30 23:40:39 +0200
committerPierre Ossman <drzeus@drzeus.cx>2008-07-15 14:14:48 +0200
commit7e9c7b64022b7faff6022df64baec8ab467d0bfd (patch)
tree53cfd0f7efbdafcb897ab8fde122c6aef1862a73 /drivers/mmc
parentMMC: S3C24XX: Add maintainer entry (diff)
downloadlinux-7e9c7b64022b7faff6022df64baec8ab467d0bfd.tar.xz
linux-7e9c7b64022b7faff6022df64baec8ab467d0bfd.zip
MMC: S3C24XX: Refuse incorrectly aligned transfers
The hardware does not support any multi-block transfers with an block-size that is not 32bit aligned. Also the driver itself does not support single block non-32bit transfers either. Ensure that the s3cmci_setup_data() returns the appropriate error if we encounter this. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/s3cmci.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 2b4839536975..6a1e4994b724 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/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)) {