From b8b62f2831f1393556814b7939eb317b3546b7f1 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Wed, 12 Jan 2011 14:13:23 +0100
Subject: [PATCH] --- yaml --- r: 233287 b: refs/heads/master c:
 d07102a1bb0e759ce4571df30c62998ef5d8a8d3 h: refs/heads/master i:   233285:
 cdfe1885f3cf7aadb5b6afa6f71033efa7413e03   233283:
 f7c1813c919f753f07a3ec1dd690517580d60ef6   233279:
 44f0aa910de9bbb0a280bf5d90677de8ad5769f0 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/dma/imx-dma.c | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index da00f8ddcdd3..7c73478453e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e070a60997f5bbaadd498c34380e2aa110336cf
+refs/heads/master: d07102a1bb0e759ce4571df30c62998ef5d8a8d3
diff --git a/trunk/drivers/dma/imx-dma.c b/trunk/drivers/dma/imx-dma.c
index a46e1d9fa3e4..a1eac99a5fa1 100644
--- a/trunk/drivers/dma/imx-dma.c
+++ b/trunk/drivers/dma/imx-dma.c
@@ -243,6 +243,21 @@ static struct dma_async_tx_descriptor *imxdma_prep_slave_sg(
 	else
 		dmamode = DMA_MODE_WRITE;
 
+	switch (imxdmac->word_size) {
+	case DMA_SLAVE_BUSWIDTH_4_BYTES:
+		if (sgl->length & 3 || sgl->dma_address & 3)
+			return NULL;
+		break;
+	case DMA_SLAVE_BUSWIDTH_2_BYTES:
+		if (sgl->length & 1 || sgl->dma_address & 1)
+			return NULL;
+		break;
+	case DMA_SLAVE_BUSWIDTH_1_BYTE:
+		break;
+	default:
+		return NULL;
+	}
+
 	ret = imx_dma_setup_sg(imxdmac->imxdma_channel, sgl, sg_len,
 		 dma_length, imxdmac->per_address, dmamode);
 	if (ret)